diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
| commit | 8254edbf64d60bef0d70eee01490103148dba100 (patch) | |
| tree | 282eb053995da653ee170e910da05d9530d4ff53 /src/nm-bus-manager.c | |
| parent | 857e5310d1764114da056cd2eb3d88625bb0ba81 (diff) | |
| parent | 90e8691111889a7b5f3c812f5a41f15a8a058913 (diff) | |
Update upstream source from tag 'upstream/1.9.90'
Update to upstream version '1.9.90' with Debian dir 83533c23245795edf9fe4919e4af3e78f2938519
Diffstat (limited to 'src/nm-bus-manager.c')
| -rw-r--r-- | src/nm-bus-manager.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index ca07e3d9..f6b86e90 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -171,7 +171,10 @@ close_connection_in_idle (gpointer user_data) g_hash_table_iter_init (&iter, server->obj_managers); while (g_hash_table_iter_next (&iter, (gpointer) &manager, NULL)) { - if (g_dbus_object_manager_server_get_connection (manager) == info->connection) { + gs_unref_object GDBusConnection *connection = NULL; + + connection = g_dbus_object_manager_server_get_connection (manager); + if (connection == info->connection) { g_hash_table_iter_remove (&iter); break; } @@ -250,6 +253,7 @@ private_server_manager_destroy (GDBusObjectManagerServer *manager) g_dbus_connection_close (connection, NULL, NULL, NULL); g_dbus_object_manager_server_set_connection (manager, NULL); g_object_unref (manager); + g_object_unref (connection); } static gboolean @@ -368,7 +372,10 @@ private_server_get_connection_owner (PrivateServer *s, GDBusConnection *connecti g_hash_table_iter_init (&iter, s->obj_managers); while (g_hash_table_iter_next (&iter, (gpointer) &manager, (gpointer) &owner)) { - if (g_dbus_object_manager_server_get_connection (manager) == connection) + gs_unref_object GDBusConnection *c = NULL; + + c = g_dbus_object_manager_server_get_connection (manager); + if (c == connection) return owner; } return NULL; @@ -606,7 +613,10 @@ nm_bus_manager_get_unix_user (NMBusManager *self, /* Check if it's a private connection sender, which we fake */ for (iter = priv->private_servers; iter; iter = iter->next) { - if (private_server_get_connection_by_owner (iter->data, sender)) { + gs_unref_object GDBusConnection *connection = NULL; + + connection = private_server_get_connection_by_owner (iter->data, sender); + if (connection) { *out_uid = 0; return TRUE; } |