[maemo-commits] [maemo-commits] r18159 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-24 12:08:20 +0300 (Fri, 24 Apr 2009)
New Revision: 18159

Modified:
   projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch
Log:
duh.

Modified: projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch	2009-04-24 08:15:49 UTC (rev 18158)
+++ projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch	2009-04-24 09:08:20 UTC (rev 18159)
@@ -2,11 +2,12 @@
 ===================================================================
 --- dbus-1.2.12.orig/dbus/dbus-bus.c
 +++ dbus-1.2.12/dbus/dbus-bus.c
-@@ -393,6 +393,12 @@ internal_bus_get (DBusBusType  type,
+@@ -393,6 +393,13 @@ internal_bus_get (DBusBusType  type,
        return NULL;
      }
  
-+  if (strcmp (bus_connection_addresses[DBUS_BUS_SESSION], DBUS_SESSION_BUS_DEFAULT_ADDRESS) == 0)
++  if ((type == DBUS_BUS_SESSION) && 
++      (strcmp (bus_connection_addresses[DBUS_BUS_SESSION], DBUS_SESSION_BUS_DEFAULT_ADDRESS) == 0))
 +    {
 +      _DBUS_UNLOCK (bus);
 +      return NULL;