diff --git a/src/common/gajim.py b/src/common/gajim.py index 73f1d3b720e4dbfa70ad12d0d9dbfb17ca6aea89..214f5e369d651324d40ae12a785fe42ac0496c31 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -181,12 +181,6 @@ else: # read. HAVE_LATEX = False -HAVE_INDICATOR = True -try: - import indicate -except ImportError: - HAVE_INDICATOR = False - HAVE_FARSIGHT = True try: import farsight, gst diff --git a/src/gui_interface.py b/src/gui_interface.py index 388bf14b1dd85177f4011c6223b6d250dc955c51..7a3c943d566a0c01f0f17ef30b4b54d734dc4188 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -3260,10 +3260,6 @@ class Interface: if resolver.USE_LIBASYNCNS: gobject.timeout_add(200, gajim.resolver.process) - # setup the indicator - if gajim.HAVE_INDICATOR: - notify.setup_indicator_server() - def remote_init(): if gajim.config.get('remote_control'): try: diff --git a/src/notify.py b/src/notify.py index bc934578dd0fad24a13a6b1de2dd5da0719b88e2..9c8624b68f995a55f57ce0c6f9a6b7a7049596b9 100644 --- a/src/notify.py +++ b/src/notify.py @@ -50,24 +50,6 @@ try: except ImportError: 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): """ Return True if this event must be shown in roster, else False @@ -344,18 +326,6 @@ text=None): if not path_to_image: 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 if gajim.config.get('use_notif_daemon') and dbus_support.supported: try: