summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-09-19 10:35:04 -0400
committerDan Winship <danw@gnome.org>2014-09-19 10:35:04 -0400
commit8f7b1e87c24999e3f28ac2d45c4f4bb8b2dcdaac (patch)
treee947c2fde8ca3ef30b2b13db4ebf33949e514bec
parentc6f4c354feb24278e9a30d5d90d518c1af8c1471 (diff)
downloadNetworkManager-8f7b1e87c24999e3f28ac2d45c4f4bb8b2dcdaac.tar.gz
libnm: fix private bus async codepaths
_nm_dbus_new_connection_async() wasn't marking the connection as private when it was private, causing _nm_dbus_new_proxy_for_connection*() to pass the wrong args. Fix that.
-rw-r--r--libnm/nm-dbus-helpers.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index fcbbc490df..9fe38dd499 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -98,6 +98,11 @@ new_connection_async_got_private (GObject *source, GAsyncResult *result, gpointe
connection = g_dbus_connection_new_for_address_finish (result, &error);
if (connection) {
+ /* Mark this connection as private */
+ g_object_set_data (G_OBJECT (connection),
+ NM_DBUS_PRIVATE_CONNECTION_TAG,
+ GUINT_TO_POINTER (TRUE));
+
g_simple_async_result_set_op_res_gpointer (simple, connection, g_object_unref);
g_simple_async_result_complete (simple);
g_object_unref (simple);