Skip to content
Snippets Groups Projects
Commit 72d3c578 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

import indicate in file where it's used. Fixes #4942

parent 752a6e72
No related branches found
No related tags found
No related merge requests found
...@@ -57,19 +57,22 @@ try: ...@@ -57,19 +57,22 @@ try:
except Exception: except Exception:
USER_HAS_GROWL = False USER_HAS_GROWL = False
def setup_indicator_server(): if gajim.HAVE_INDICATOR:
server = indicate.indicate_server_ref_default() import indicate
server.set_type('message.im')
server.set_desktop_file('/usr/share/applications/gajim.desktop') def setup_indicator_server():
server.connect('server-display', server_display) server = indicate.indicate_server_ref_default()
server.show() server.set_type('message.im')
server.set_desktop_file('/usr/share/applications/gajim.desktop')
def display(indicator, account, jid, msg_type): server.connect('server-display', server_display)
gajim.interface.handle_event(account, jid, msg_type) server.show()
indicator.hide()
def display(indicator, account, jid, msg_type):
def server_display(server): gajim.interface.handle_event(account, jid, msg_type)
win = gajim.interface.roster.window indicator.hide()
def server_display(server):
win = gajim.interface.roster.window
win.present() win.present()
def get_show_in_roster(event, account, contact, session=None): def get_show_in_roster(event, account, contact, session=None):
...@@ -604,7 +607,7 @@ class DesktopNotification: ...@@ -604,7 +607,7 @@ class DesktopNotification:
if version >= [0, 3, 2]: if version >= [0, 3, 2]:
hints['urgency'] = dbus.Byte(0) # Low Urgency hints['urgency'] = dbus.Byte(0) # Low Urgency
hints['category'] = dbus.String(ntype) hints['category'] = dbus.String(ntype)
# it seems notification-daemon doesn't like empty text # it seems notification-daemon doesn't like empty text
if self.text: if self.text:
text = self.text text = self.text
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment