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-wired.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-wired.c')
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index f641e8a813..4338ab047e 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -22,13 +22,11 @@ #include <string.h> #include <net/ethernet.h> -#include <dbus/dbus-glib.h> #include <glib/gi18n.h> #include "nm-setting-wired.h" #include "nm-utils.h" #include "nm-utils-private.h" -#include "nm-dbus-glib-types.h" #include "nm-setting-private.h" /** @@ -895,7 +893,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); _nm_setting_class_transform_property (parent_class, NM_SETTING_WIRED_MAC_ADDRESS, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_from_dbus); @@ -913,7 +911,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); _nm_setting_class_transform_property (parent_class, NM_SETTING_WIRED_CLONED_MAC_ADDRESS, - DBUS_TYPE_G_UCHAR_ARRAY, + G_VARIANT_TYPE_BYTESTRING, _nm_utils_hwaddr_to_dbus, _nm_utils_hwaddr_from_dbus); @@ -999,7 +997,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); _nm_setting_class_transform_property (parent_class, NM_SETTING_WIRED_S390_OPTIONS, - DBUS_TYPE_G_MAP_OF_STRING, + G_VARIANT_TYPE ("a{ss}"), _nm_utils_strdict_to_dbus, _nm_utils_strdict_from_dbus); } |