diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /src/nm-dbus-manager.c | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'src/nm-dbus-manager.c')
| -rw-r--r-- | src/nm-dbus-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index f57eeb8e..7e20b2c1 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -36,6 +36,7 @@ #include <dbus/dbus-glib-lowlevel.h> #include <string.h> #include "nm-logging.h" +#include "NetworkManagerUtils.h" #define PRIV_SOCK_PATH NMRUNDIR "/private" #define PRIV_SOCK_TAG "private" @@ -490,7 +491,7 @@ private_server_setup (NMDBusManager *self) NMDBusManagerPrivate *priv = NM_DBUS_MANAGER_GET_PRIVATE (self); /* Skip this step if this is just a test program */ - if (g_test_initialized ()) + if (nm_utils_get_testing ()) return; /* Set up our main private DBus socket */ |