fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 10:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-manager: don't try to create private bus in test programs

Browse source 
When running test programs, don't try to create a private bus, since
it will fail if the user isn't root or if NetworkManager is currently
running, and it isn't what we want anyway.
This commit is contained in:
Dan Winship 2014-04-17 16:58:18 -04:00
parent 8537db959c
commit e3fc25731e
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/nm-dbus-manager.c
View file

@ -466,16 +466,16 @@ private_connection_disconnected (NMDBusManager *self, DBusGConnection *connectio
g_signal_emit (G_OBJECT (self), signals[NAME_OWNER_CHANGED],
0, owner, owner, NULL);
}
#endif /* HAVE_DBUS_GLIB_100 */
static void
nm_dbus_manager_init (NMDBusManager *self)
private_server_setup (NMDBusManager *self)
{
NMDBusManagerPrivate *priv = NM_DBUS_MANAGER_GET_PRIVATE (self);
priv->exported = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
/* Skip this step if this is just a test program */
if (g_test_initialized ())
return;
#if HAVE_DBUS_GLIB_100
/* Set up our main private DBus socket */
if (mkdir (NMRUNDIR, 0700) == -1) {
if (errno != EEXIST)
@ -494,6 +494,18 @@ nm_dbus_manager_init (NMDBusManager *self)
(GCallback) private_connection_disconnected,
NULL);
}
}
#endif /* HAVE_DBUS_GLIB_100 */
static void
nm_dbus_manager_init (NMDBusManager *self)
{
NMDBusManagerPrivate *priv = NM_DBUS_MANAGER_GET_PRIVATE (self);
priv->exported = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
#if HAVE_DBUS_GLIB_100
private_server_setup (self);
#endif
}