From bf6c87b888207eb940039567a836d96861a877dd Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 14 Sep 2007 20:50:19 +0000
Subject: [PATCH] don't TB when dbus is not present. fixes #3328
---
src/gajim.py | 9 ++++++---
src/roster_window.py | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/gajim.py b/src/gajim.py
index e523ed2cbe..926ec5635e 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -2717,9 +2717,12 @@ class Interface:
auto=True)
gajim.sleeper_state[account] = 'autoaway'
- bus = dbus.SessionBus()
- bus.add_signal_receiver(gnome_screensaver_ActiveChanged_cb,
- 'ActiveChanged', 'org.gnome.ScreenSaver')
+ try:
+ bus = dbus.SessionBus()
+ bus.add_signal_receiver(gnome_screensaver_ActiveChanged_cb,
+ 'ActiveChanged', 'org.gnome.ScreenSaver')
+ except:
+ pass
self.show_vcard_when_connect = []
diff --git a/src/roster_window.py b/src/roster_window.py
index 05ad866a90..4b3e8132ed 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3681,13 +3681,13 @@ class RosterWindow:
if not dbus_support.supported:
# do nothing if user doesn't have D-Bus bindings
return
- bus = dbus.SessionBus()
try:
+ bus = dbus.SessionBus()
if not 'com.google.code.Awn' in bus.list_names():
# Awn is not installed
return
except:
- pass
+ return
iconset = gajim.config.get('iconset')
prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32')
if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'):
--
GitLab