diff options
author | Thomas Haller <thaller@redhat.com> | 2015-05-06 16:45:42 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-07-03 09:24:02 +0200 |
commit | 6d1ca9d614778a0736649391d3f2ab66243fe1ad (patch) | |
tree | 6760a7fa6fffbafbef9995f4cad67533cf5e8dd6 /src/nm-dbus-manager.c | |
parent | 79af56e0b8bc92cd345589dc0a42eb5a2c462a75 (diff) | |
download | NetworkManager-6d1ca9d614778a0736649391d3f2ab66243fe1ad.tar.gz |
core: replace g_test_initialized() by nm_utils_get_testing()
(cherry picked from commit 9ac4d88ff70e3a4c49c58091d388b1544116bce3)
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 f57eeb8e3f..7e20b2c169 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 */ |