diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-05-19 14:12:38 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-05-19 14:46:27 +0200 |
| commit | 4bab4294a68785b191f3802a2086368484d151d2 (patch) | |
| tree | 1cf25e19b3f88fa8aadc15e2361df33afb5d2ff8 | |
| parent | ae0608eef51cad2a583e98a17e478fbb497252f5 (diff) | |
| download | NetworkManager-4bab4294a68785b191f3802a2086368484d151d2.tar.gz | |
libnm: fix NMVpnPluginOld registering VPN service
RequestName DBus call takes two agruments:
http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-names
timeout in g_dbus_proxy_call_sync() can't be 0 because it means literally zero
milliseconds and the call times out.
| -rw-r--r-- | libnm/nm-vpn-plugin-old.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index e6843f7e18..b0334febcb 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -903,8 +903,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) ret = g_dbus_proxy_call_sync (proxy, "RequestName", - g_variant_new ("(s)", priv->dbus_service_name), - G_DBUS_CALL_FLAGS_NONE, 0, + g_variant_new ("(su)", priv->dbus_service_name, 0), + G_DBUS_CALL_FLAGS_NONE, -1, cancellable, error); g_object_unref (proxy); if (!ret) { |