Author: asterix Date: 2007-09-14 22:50:19 +0200 (Fri, 14 Sep 2007) New Revision: 8816

Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: don't TB when dbus is not present. fixes #3328

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-09-14 20:18:06 UTC (rev 8815) +++ trunk/src/gajim.py 2007-09-14 20:50:19 UTC (rev 8816) @@ -2717,9 +2717,12 @@ 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 = []

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-09-14 20:18:06 UTC (rev 8815) +++ trunk/src/roster_window.py 2007-09-14 20:50:19 UTC (rev 8816) @@ -3681,13 +3681,13 @@ 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'):