copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

indicator API changes too much, remove it's support. Fixes #5694

This commit is contained in:
Yann Leboulanger 2010-05-11 17:20:23 +02:00
parent f8ab01b418
commit bcee7c2125
3 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gajim.py
View File

@ -181,12 +181,6 @@ else:
# read. # read.
HAVE_LATEX = False HAVE_LATEX = False
HAVE_INDICATOR = True
try:
import indicate
except ImportError:
HAVE_INDICATOR = False
HAVE_FARSIGHT = True HAVE_FARSIGHT = True
try: try:
import farsight, gst import farsight, gst

4
src/gui_interface.py
View File

@ -3260,10 +3260,6 @@ class Interface:
if resolver.USE_LIBASYNCNS: if resolver.USE_LIBASYNCNS:
gobject.timeout_add(200, gajim.resolver.process) gobject.timeout_add(200, gajim.resolver.process)
# setup the indicator
if gajim.HAVE_INDICATOR:
notify.setup_indicator_server()
def remote_init(): def remote_init():
if gajim.config.get('remote_control'): if gajim.config.get('remote_control'):
try: try:

30
src/notify.py
View File

@ -50,24 +50,6 @@ try:
except ImportError: except ImportError:
USER_HAS_PYNOTIFY = False USER_HAS_PYNOTIFY = False
if gajim.HAVE_INDICATOR:
import indicate
def setup_indicator_server():
server = indicate.indicate_server_ref_default()
server.set_type('message.im')
server.set_desktop_file('/usr/share/applications/gajim.desktop')
server.connect('server-display', server_display)
server.show()
def display(indicator, account, jid, msg_type):
gajim.interface.handle_event(account, jid, msg_type)
indicator.hide()
def server_display(server):
win = gajim.interface.roster.window
win.present()
def get_show_in_roster(event, account, contact, session=None): def get_show_in_roster(event, account, contact, session=None):
""" """
Return True if this event must be shown in roster, else False Return True if this event must be shown in roster, else False
@ -344,18 +326,6 @@ text=None):
if not path_to_image: if not path_to_image:
path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48) path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48)
if gajim.HAVE_INDICATOR and event_type in (_('New Message'),
_('New Single Message'), _('New Private Message')):
indicator = indicate.Indicator()
indicator.set_property('subtype', 'im')
indicator.set_property('sender', jid)
indicator.set_property('body', text)
indicator.set_property_time('time', time.time())
pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_image)
indicator.set_property_icon('icon', pixbuf)
indicator.connect('user-display', display, account, jid, msg_type)
indicator.show()
# Try to show our popup via D-Bus and notification daemon # Try to show our popup via D-Bus and notification daemon
if gajim.config.get('use_notif_daemon') and dbus_support.supported: if gajim.config.get('use_notif_daemon') and dbus_support.supported:
try: try: