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

Proposed by Chris Coulson
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 755
Merged at revision: 757
Proposed branch: lp:~chrisccoulson/unity-2d/lp873027
Merge into: lp:unity-2d
Diff against target: 28 lines (+11/-0)
1 file modified
libunity-2d-private/src/unity2dapplication.cpp (+11/-0)
To merge this branch: bzr merge lp:~chrisccoulson/unity-2d/lp873027
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
Review via email: mp+79172@code.launchpad.net

Commit message

[launcher] Unset DBUS_STARTER_* variables

These variables must not be propagated to child processes.

Description of the change

[launcher] Unset DBUS_STARTER_* variables

These variables must not be propagated to child processes.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Thanks Chris! Works perfectly, and code is neat.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
2--- libunity-2d-private/src/unity2dapplication.cpp 2011-10-10 11:05:45 +0000
3+++ libunity-2d-private/src/unity2dapplication.cpp 2011-10-12 19:54:23 +0000
4@@ -41,6 +41,9 @@
5 #include <gtk/gtk.h>
6 #include <pango/pango.h>
7
8+// libc
9+#include <stdlib.h>
10+
11 ///////////////////////////////
12 class PlatformFontTracker
13 {
14@@ -133,6 +136,14 @@
15 QApplication::setGraphicsSystem("raster");
16 }
17
18+ /* We have these if we were DBus activated, but we don't want our child
19+ * processes to inherit them
20+ *
21+ * https://launchpad.net/bugs/873027
22+ */
23+ unsetenv("DBUS_STARTER_ADDRESS");
24+ unsetenv("DBUS_STARTER_BUS_TYPE");
25+
26 /* Unless style has been specified in args, set default Qt style to
27 * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle
28 * because it uses libgtk2, which causes conflicts with our gtk3 code.

Subscribers

People subscribed via source and target branches