diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-10-08 14:44:45 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-10-08 14:44:45 +0200 |
| commit | 17cbcbe489ab75aaa59d0c89dcec0b4ae8c51f93 (patch) | |
| tree | 1c552b904500936e2b94ab91d848347f9f5cb905 | |
| parent | e0f3254f95d6951719ed6869af76a5bd7db2e577 (diff) | |
| download | NetworkManager-lr/om.tar.gz | |
libnm/nm-manager: don't block the object creation on permissionslr/om
The GetPermissions call is very expensive (~400ms here, an extra
NM->polkit call for every known permission while polkit being really
slow to answer) yet seldom needed.
There's no methods to access the permissions -- they're only
communicated via signals.
Unfortunately, we don't know when a signal is hooked, so we still need
to kick of the call. Nevertheless, we don't need to wait for it to
finish.
| -rw-r--r-- | libnm/nm-manager.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 92186bcc3e..efe35ced3a 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -1199,18 +1199,18 @@ init_async_complete (NMManagerInitData *init_data) static void init_async_got_permissions (GObject *object, GAsyncResult *result, gpointer user_data) { - NMManagerInitData *init_data = user_data; + NMManager *manager = user_data; GVariant *permissions; if (nmdbus_manager_call_get_permissions_finish (NMDBUS_MANAGER (object), &permissions, result, NULL)) { - update_permissions (init_data->manager, permissions); + update_permissions (manager, permissions); g_variant_unref (permissions); } else - update_permissions (init_data->manager, NULL); + update_permissions (manager, NULL); - init_async_complete (init_data); + g_object_unref (manager); } static void @@ -1228,7 +1228,10 @@ init_async_parent_inited (GObject *source, GAsyncResult *result, gpointer user_d nmdbus_manager_call_get_permissions (priv->manager_proxy, init_data->cancellable, - init_async_got_permissions, init_data); + init_async_got_permissions, + g_object_ref (init_data->manager)); + + init_async_complete (init_data); } static void |