[commit-gajim] r11031 - in trunk: . src src/common - Commits

26 Jan 2009

Author: asterix
Date: 2009-01-26 17:15:05 +0100 (Mon, 26 Jan 2009)
New Revision: 11031
Modified:
   trunk/README.html
   trunk/src/common/dbus_support.py
   trunk/src/gajim-remote.py
Log:
test if dbus0x11 is installed before using dbus. Fixes #4715
Modified: trunk/README.html
===================================================================

--- trunk/README.html	2009-01-26 10:27:46 UTC (rev 11030)
+++ trunk/README.html	2009-01-26 16:15:05 UTC (rev 11031)
@@ -32,12 +32,12 @@
 <li>python-crypto to enable End to end encryption</li>
 <li>For idle module, libxss library</li>
 <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
-<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li>
+<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
 <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
 <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
 <li>python-dbus bindings</li>
 <li>python-sexy to have clickable URLs in chat windows</li>
 <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
Modified: trunk/src/common/dbus_support.py
===================================================================
--- trunk/src/common/dbus_support.py	2009-01-26 10:27:46 UTC (rev 11030)
+++ trunk/src/common/dbus_support.py	2009-01-26 16:15:05 UTC (rev 11031)
@@ -40,6 +40,8 @@
    		pass
    import dbus
    import dbus.glib
+	# test if dbus-x11 is installed
+	bus = dbus.SessionBus()
    supported = True # does user have D-Bus bindings?
 except ImportError:
    supported = False
Modified: trunk/src/gajim-remote.py
===================================================================
--- trunk/src/gajim-remote.py	2009-01-26 10:27:46 UTC (rev 11030)
+++ trunk/src/gajim-remote.py	2009-01-26 16:15:05 UTC (rev 11031)
@@ -52,6 +52,8 @@
    import dbus
    import dbus.service
    import dbus.glib
+	# test if dbus-x11 is installed
+	bus = dbus.SessionBus()
 except Exception:
    print str(exceptions.DbusNotSupported())
    sys.exit(1)

    