Attachment 571870 Details for Bug 802536 – Modified patch to fix NMClient init

[patch] Modified patch to fix NMClient init

nm-client-init.patch (text/plain), 1.79 KB, created by Pavel Šimerda (pavlix) on 2012-03-21 21:28:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Šimerda (pavlix)

Created: 2012-03-21 21:28:14 UTC

Size: 1.79 KB

patch

obsolete

>Index: NetworkManager-0.9.3.997/libnm-glib/nm-client.c
>===================================================================
>--- NetworkManager-0.9.3.997.orig/libnm-glib/nm-client.c
>+++ NetworkManager-0.9.3.997/libnm-glib/nm-client.c
>@@ -122,6 +122,27 @@ static void
> nm_client_init (NMClient *client)
> {
> 	NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
>+	DBusGConnection *connection;
>+	GError *err = NULL;
>+
>+	g_object_get (client,
>+	                       NM_OBJECT_DBUS_CONNECTION, &connection,
>+	                       NULL);
>+	if (!connection) {
>+#ifdef LIBNM_GLIB_TEST
>+		connection = dbus_g_bus_get (DBUS_BUS_SESSION, &err);
>+#else
>+		connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
>+#endif
>+		if (!connection) {
>+			g_warning ("Couldn't connect to system bus: %s", err->message);
>+			g_error_free (err);
>+		}
>+		g_object_set (client,
>+		                       NM_OBJECT_DBUS_CONNECTION, connection,
>+		                       NM_OBJECT_DBUS_PATH, NM_DBUS_PATH,
>+		                       NULL);
>+	}
> 
> 	priv->state = NM_STATE_UNKNOWN;
> 
>@@ -1140,24 +1161,10 @@ client_device_removed (NMObject *client,
> NMClient *
> nm_client_new (void)
> {
>-	DBusGConnection *connection;
>-	GError *err = NULL;
> 	NMClient *client;
> 
>-#ifdef LIBNM_GLIB_TEST
>-	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &err);
>-#else
>-	connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
>-#endif
>-	if (!connection) {
>-		g_warning ("Couldn't connect to system bus: %s", err->message);
>-		g_error_free (err);
>-		return NULL;
>-	}
>-
> 	client = g_object_new (NM_TYPE_CLIENT,
>-	                       NM_OBJECT_DBUS_CONNECTION, connection,
>-	                       NM_OBJECT_DBUS_PATH, NM_DBUS_PATH,
>+	                       NM_OBJECT_DBUS_CONNECTION, NULL,
> 	                       NULL);
> 	_nm_object_ensure_inited (NM_OBJECT (client));
> 	return client;

Actions: View | Diff

Attachments on bug 802536: 571785 | 571870