diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-01-29 13:24:43 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-29 13:30:14 +0100 |
| commit | 5ae4245be274aea569351d6aa5fada40efe1b06e (patch) | |
| tree | 7361a773ce733724e8730425f33aee40db09bc06 | |
| parent | 4cc54941cc1c12c4fc25d41668af958de7433cc5 (diff) | |
| download | NetworkManager-5ae4245be274aea569351d6aa5fada40efe1b06e.tar.gz | |
manager: Fix GVariant format strings for AddAndActivate2 return value
AddAndActivate2 returns an empty a{sv} dictionary for extensibility. The
format strings to create the methods return value were slightly wrong,
causing assertion failures.
Fixes: fbb038af5e5d675c994de26da676edfd8e73ffbe
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/73
| -rw-r--r-- | src/nm-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 703cb58852..67d94fdecc 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -5312,10 +5312,10 @@ activation_add_done (NMSettings *settings, nm_dbus_object_get_path (NM_DBUS_OBJECT (new_connection)), nm_dbus_object_get_path (NM_DBUS_OBJECT (active))); } else { - result_floating = g_variant_new ("(ooa{sv})", + result_floating = g_variant_new ("(oo@a{sv})", nm_dbus_object_get_path (NM_DBUS_OBJECT (new_connection)), nm_dbus_object_get_path (NM_DBUS_OBJECT (active)), - g_variant_new_array (G_VARIANT_TYPE ("a{sv}"), NULL, 0)); + g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0)); } g_dbus_method_invocation_return_value (context, result_floating); |