Changeset 7940 for branches/gajim_0.11/src/notify.py

Timestamp:

02/06/07 20:54:30 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/gajim_0.11/src/notify.py (modified) (4 diffs)

branches/gajim_0.11/src/notify.py

@@ -401 +401 @@
                 self.text = text
                 '''0.3.1 is the only version of notification daemon that has no way to determine which version it is. If no method exists, it means they're using that one.'''
-                self.default_version = '0.3.1'
+                self.default_version = [0, 3, 1]
                 self.account = account
                 self.jid = jid
@@ -452 +452 @@
                 timeout = gajim.config.get('notification_timeout') # in seconds
                 ntype = self.ntype
-                if version.startswith('0.2'):
+                if version[:2] == [0, 2]:
                         try:
                                 self.notif.Notify(
@@ -470 +470 @@
                                         error_handler=self.notify_another_way)
                         except AttributeError:
-                                version = '0.3.1' # we're actually dealing with the newer version
-                if version.startswith('0.3'):
-                        if version >= ( 0, 3, 2):
+                                version = [0, 3, 1] # we're actually dealing with the newer version
+                if version > [0, 3]:
+                        if version >= [0, 3, 2]:
                                 hints = {}
                                 hints['urgency'] = dbus.Byte(0) # Low Urgency
@@ -519 +519 @@
 
         def version_reply_handler(self, name, vendor, version, spec_version = None):
-                self.version = version
+                version_list = version.split('.')
+                self.version = []
+                while len(version_list):
+                        self.version.append(int(version_list.pop(0)))
                 self.attempt_notify()