Merge lp:~chrisccoulson/unity-2d/lp873027 into lp:unity-2d

[Chris Coulson]

[launcher] Unset DBUS_STARTER_* variables

These variables must not be propagated to child processes.

[launcher] Unset DBUS_STARTER_* variables

These variables must not be propagated to child processes.

[Alberto Mardegan (mardy)]

Thanks Chris! Works perfectly, and code is neat.

review: Approve

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-10-10 11:05:45 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-10-12 19:54:23 +0000
@@ -41,6 +41,9 @@
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 
+// libc
+#include <stdlib.h>
+
 ///////////////////////////////
 class PlatformFontTracker
 {
@@ -133,6 +136,14 @@
         QApplication::setGraphicsSystem("raster");
     }
 
+    /* We have these if we were DBus activated, but we don't want our child
+     * processes to inherit them
+     *
+     * https://launchpad.net/bugs/873027
+     */
+    unsetenv("DBUS_STARTER_ADDRESS");
+    unsetenv("DBUS_STARTER_BUS_TYPE");
+
     /* Unless style has been specified in args, set default Qt style to
      * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle
      * because it uses libgtk2, which causes conflicts with our gtk3 code.