colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: fix calling callback when activating connection

Browse Source 
Connections were not added to pending_activations resulting in callback
not being called.
This commit is contained in:
Jiří Klimeš
2011-03-16 13:03:15 +01:00
parent 5aa3b6081b
commit d91c68235d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libnm-glib/nm-client.c
View File

@@ -675,6 +675,7 @@ nm_client_activate_connection (NMClient *client,
NMClientActivateFn callback, NMClientActivateFn callback,
gpointer user_data) gpointer user_data)
{ {
NMClientPrivate *priv;
ActivateInfo *info; ActivateInfo *info;
g_return_if_fail (NM_IS_CLIENT (client)); g_return_if_fail (NM_IS_CLIENT (client));
@@ -687,7 +688,10 @@ nm_client_activate_connection (NMClient *client,
info->user_data = user_data; info->user_data = user_data;
info->client = client; info->client = client;
org_freedesktop_NetworkManager_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->client_proxy, priv = NM_CLIENT_GET_PRIVATE (client);
priv->pending_activations = g_slist_prepend (priv->pending_activations, info);
org_freedesktop_NetworkManager_activate_connection_async (priv->client_proxy,
nm_connection_get_path (connection), nm_connection_get_path (connection),
device ? nm_object_get_path (NM_OBJECT (device)) : "/", device ? nm_object_get_path (NM_OBJECT (device)) : "/",
specific_object ? specific_object : "/", specific_object ? specific_object : "/",
@@ -743,6 +747,7 @@ nm_client_add_and_activate_connection (NMClient *client,
NMClientAddActivateFn callback, NMClientAddActivateFn callback,
gpointer user_data) gpointer user_data)
{ {
NMClientPrivate *priv;
ActivateInfo *info; ActivateInfo *info;
GHashTable *hash = NULL; GHashTable *hash = NULL;
@@ -758,7 +763,11 @@ nm_client_add_and_activate_connection (NMClient *client,
hash = nm_connection_to_hash (partial, NM_SETTING_HASH_FLAG_ALL); hash = nm_connection_to_hash (partial, NM_SETTING_HASH_FLAG_ALL);
else else
hash = g_hash_table_new (g_str_hash, g_str_equal); hash = g_hash_table_new (g_str_hash, g_str_equal);
org_freedesktop_NetworkManager_add_and_activate_connection_async (NM_CLIENT_GET_PRIVATE (client)->client_proxy,
priv = NM_CLIENT_GET_PRIVATE (client);
priv->pending_activations = g_slist_prepend (priv->pending_activations, info);
org_freedesktop_NetworkManager_add_and_activate_connection_async (priv->client_proxy,
hash, hash,
nm_object_get_path (NM_OBJECT (device)), nm_object_get_path (NM_OBJECT (device)),
specific_object ? specific_object : "/", specific_object ? specific_object : "/",