From 8cc90d1d734c2b89861417fa2f73084632c8b7f9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 11 Dec 2005 16:58:20 +0000
Subject: [PATCH] fix DBus TB

---
 src/dbus_support.py | 4 ++--
 src/notify.py       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dbus_support.py b/src/dbus_support.py
index 6450df7b69..6a3f529d8b 100644
--- a/src/dbus_support.py
+++ b/src/dbus_support.py
@@ -70,7 +70,7 @@ def present(self):
 		if self.session_bus is None:
 			try:
 				self.session_bus = dbus.SessionBus()
-			except dbus.DBusException:
+			except dbus.dbus_bindings.DBusException:
 				self.session_bus = None
 				return False
 			if self.session_bus is None:
@@ -106,7 +106,7 @@ def get_interface(interface, path):
 	except Exception, e:
 		print >> sys.stderr, e
 		return None
-	except dbus.DBusException, e:
+	except dbus.dbus_bindings.DBusException, e:
 		# This exception could give useful info about why notification breaks
 		print >> sys.stderr, e
 		return None
diff --git a/src/notify.py b/src/notify.py
index f5c048b1cb..f4f820ab1a 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -55,7 +55,7 @@ def notify(event_type, jid, account, msg_type = '', file_props = None):
 		try:
 			DesktopNotification(event_type, jid, account, msg_type, file_props)
 			return
-		except dbus.DBusException, e:
+		except dbus.dbus_bindings.DBusException, e:
 			# Connection to DBus failed, try popup
 			print >> sys.stderr, e
 		except TypeError, e:
@@ -188,7 +188,7 @@ def __init__(self, event_type, jid, account, msg_type = '', file_props = None):
 
 		self.notif = dbus_support.get_notifications_interface()
 		if self.notif is None:
-			raise dbus.DBusException()
+			raise dbus.dbus_bindings.DBusException()
 		self.id = self.notif.Notify(dbus.String(_('Gajim')),
 			dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
 			dbus.String(event_type), dbus.String(txt),
-- 
GitLab