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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-23 10:37:45 +0300 (Thu, 23 Apr 2009)
New Revision: 18142

Added:
   projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch
Log:
try to prevent autolaunch from happening

Added: projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch	2009-04-23 05:47:02 UTC (rev 18141)
+++ projects/haf/trunk/dbus/debian/patches/40-prevent-autolaunch.patch	2009-04-23 07:37:45 UTC (rev 18142)
@@ -0,0 +1,17 @@
+Index: dbus-1.2.12/dbus/dbus-bus.c
+===================================================================
+--- 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,
+       return NULL;
+     }
+ 
++  if (strcmp (bus_connection_addresses[DBUS_BUS_SESSION], DBUS_SESSION_BUS_DEFAULT_ADDRESS) == 0)
++    {
++      _DBUS_UNLOCK (bus);
++      return NULL;
++    }
++
+   /* We want to use the activation address even if the
+    * activating bus is the session or system bus,
+    * per the spec.