diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-09-02 10:22:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-21 14:58:26 +0200 |
| commit | be3712f6fbdf79a44512cef5da4005b2c9710da7 (patch) | |
| tree | c8932d56c5f035bb4073e7321f6c0f297c5016a5 /libnm/nm-secret-agent-old.c | |
| parent | 908fadec964e028b3be3382a74d535b3c3324e2f (diff) | |
| download | NetworkManager-be3712f6fbdf79a44512cef5da4005b2c9710da7.tar.gz | |
libnm: drop nm_dbus_new_connection() helper API
We don't need a wrapper around g_bus_get*(). Just use
it directly.
I guess in the past this had some use when we were using
a private socket too. Those days are gone. If we are going
to re-introduce private socket support, then we probably should
come up with a better solution.
Diffstat (limited to 'libnm/nm-secret-agent-old.c')
| -rw-r--r-- | libnm/nm-secret-agent-old.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 39742c0ea1..b77bd443cc 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -1052,7 +1052,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data) NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (init_data->self); GError *error = NULL; - priv->bus = _nm_dbus_new_connection_finish (result, &error); + priv->bus = g_bus_get_finish (result, &error); if (!priv->bus) { init_async_complete (init_data, error); return; @@ -1150,7 +1150,7 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) NMSecretAgentOld *self = NM_SECRET_AGENT_OLD (initable); NMSecretAgentOldPrivate *priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - priv->bus = _nm_dbus_new_connection (cancellable, error); + priv->bus = g_bus_get_sync (_nm_dbus_bus_type (), cancellable, error); if (!priv->bus) return FALSE; @@ -1193,7 +1193,10 @@ init_async (GAsyncInitable *initable, int io_priority, if (cancellable) g_simple_async_result_set_check_cancellable (init_data->simple, cancellable); - _nm_dbus_new_connection_async (cancellable, init_async_got_bus, init_data); + g_bus_get (_nm_dbus_bus_type (), + cancellable, + init_async_got_bus, + init_data); } static gboolean |