Ticket #2784: gajim-01-no-dbus_bindings.patch

src/notify.py

@@ -288 +288 @@
                         DesktopNotification(event_type, jid, account, msg_type,
                                 path_to_image, title, text)
                         return  # sucessfully did D-Bus Notification procedure!
-                except dbus.dbus_bindings.DBusException, e:
+                except dbus.DBusException, e:
                         # Connection to D-Bus failed
                         gajim.log.debug(str(e))
                 except TypeError, e:
@@ -438 +438 @@
 
                 self.notif = dbus_support.get_notifications_interface()
                 if self.notif is None:
-                        raise dbus.dbus_bindings.DBusException()
+                        raise dbus.DBusException('unable to get notifications interface')
                 self.ntype = ntype
 
                 self.get_version()

src/common/zeroconf/zeroconf.py

@@ -248 +248 @@
 
                         return True
                 
-                except dbus.dbus_bindings.DBusException, e:
+                except dbus.DBusException, e:
                         gajim.log.debug(str(e))
                         return False
                         
@@ -279 +279 @@
                                 return True
                         else:
                                 return False
-                except dbus.dbus_bindings.DBusException, e:
+                except dbus.DBusException, e:
                         gajim.log.debug("Can't remove service. That should not happen")
 
         def browse_domain(self, interface, protocol, domain):

src/common/dbus_support.py

@@ -55 +55 @@
                 if self.system_bus is None:
                         try:
                                 self.system_bus = dbus.SystemBus()
-                        except dbus.dbus_bindings.DBusException:
+                        except dbus.DBusException:
                                 self.system_bus = None
                                 return False
                         if self.system_bus is None:
@@ -86 +86 @@
                 if self.session_bus is None:
                         try:
                                 self.session_bus = dbus.SessionBus()
-                        except dbus.dbus_bindings.DBusException:
+                        except dbus.DBusException:
                                 self.session_bus = None
                                 return False
                         if self.session_bus is None:

src/music_track_listener.py

@@ -114 +114 @@
 
                 bus = dbus.SessionBus()
 
+                if not hasattr(bus, 'name_has_owner'):
+                    # can't support dbus-python < 0.80 using only public API
+                    return None
+
                 ## Check Muine playing track
-                if dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(),
-                        'org.gnome.Muine'):
+                if bus.name_has_owner('org.gnome.Muine'):
                         obj = bus.get_object('org.gnome.Muine', '/org/gnome/Muine/Player')
                         player = dbus.Interface(obj, 'org.gnome.Muine.Player')
                         if player.GetPlaying():
@@ -126 +129 @@
                                 return song
 
                 ## Check Rhythmbox playing song
-                if dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(),
-                        'org.gnome.Rhythmbox'):
+                if bus.name_has_owner('org.gnome.Rhythmbox'):
                         rbshellobj = bus.get_object('org.gnome.Rhythmbox',
                                 '/org/gnome/Rhythmbox/Shell')
                         player = dbus.Interface(