[commit-gajim] r11211 - trunk/src
asterix at gajim.org
asterix at gajim.org
Wed Apr 8 09:31:11 CEST 2009
Author: asterix
Date: 2009-04-08 09:31:11 +0200 (Wed, 08 Apr 2009)
New Revision: 11211
Modified:
trunk/src/notify.py
Log:
import indicate in file where it's used. Fixes #4942
Modified: trunk/src/notify.py
===================================================================
--- trunk/src/notify.py 2009-04-08 07:30:40 UTC (rev 11210)
+++ trunk/src/notify.py 2009-04-08 07:31:11 UTC (rev 11211)
@@ -57,19 +57,22 @@
except Exception:
USER_HAS_GROWL = False
-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()
+if gajim.HAVE_INDICATOR:
+ import indicate
-def display(indicator, account, jid, msg_type):
- gajim.interface.handle_event(account, jid, msg_type)
- indicator.hide()
+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 server_display(server):
- win = gajim.interface.roster.window
+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):
@@ -604,7 +607,7 @@
if version >= [0, 3, 2]:
hints['urgency'] = dbus.Byte(0) # Low Urgency
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:
text = self.text
else:
More information about the Commits
mailing list