diff options
| author | Dan Winship <danw@gnome.org> | 2014-08-16 10:09:48 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-09-18 11:51:09 -0400 |
| commit | acf86f68b33b14070d9b03a681fe94ffeead66ef (patch) | |
| tree | 28069ac74e5bc7ecfc185495969cdeab7ca203a8 /libnm-core/nm-setting-bridge.c | |
| parent | 4750559548fd1a0fb73cb826fa818dfe1e4f6940 (diff) | |
| download | NetworkManager-acf86f68b33b14070d9b03a681fe94ffeead66ef.tar.gz | |
libnm-core: change connection hash tables to variants in API
In preparation for porting to GDBus, make nm_connection_to_dbus(),
etc, represent connections as GVariants of type 'a{sa{sv}}' rather
than as GHashTables-of-GHashTables-of-GValues.
This means we're constantly converting back and forth internally, but
this is just a stepping stone on the way to the full GDBus port, and
all of that code will go away again later.
Diffstat (limited to 'libnm-core/nm-setting-bridge.c')
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 49bca2e813..720f5cb278 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -22,7 +22,6 @@ #include <string.h> #include <ctype.h> #include <stdlib.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-bridge.h" @@ -388,7 +387,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); _nm_setting_class_transform_property (parent_class, NM_SETTING_BRIDGE_MAC_ADDRESS, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_from_dbus); @@ -478,7 +477,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); - _nm_setting_class_add_dbus_only_property (parent_class, "interface-name", G_TYPE_STRING, + _nm_setting_class_add_dbus_only_property (parent_class, "interface-name", + G_VARIANT_TYPE_STRING, _nm_setting_get_deprecated_virtual_interface_name, NULL); } |