colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: final gdbus porting

Browse Source 
Port remaining bits to gdbus and remove stray dbus-glib references

Drop the dbus-glib version check from configure, since nothing depends
on new dbus-glib any more.

Move nm-dbus-glib-types.h and nm-gvaluearray-compat.h from include/ to
libnm-util/ since they are now only used by libnm-util and libnm-glib.
This commit is contained in:
Dan Winship
2015-04-16 12:34:55 -04:00
parent 34ba4e14b8
commit 1cf35cb26b
39 changed files with 41 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/NetworkManagerUtils.c
View File

@@ -44,7 +44,6 @@
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
#include "nm-auth-utils.h"
#include "nm-dbus-glib-types.h"
/*
* Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
@@ -2890,47 +2889,6 @@ nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid,
memcpy (iid, addr->s6_addr + 8, 8);
}
/**
* nm_utils_connection_hash_to_dict:
* @hash: a hashed #NMConnection
*
* Returns: a (floating) #GVariant equivalent to @hash.
*/
GVariant *
nm_utils_connection_hash_to_dict (GHashTable *hash)
{
GValue val = { 0, };
GVariant *variant;
if (!hash)
return NULL;
g_value_init (&val, DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT);
g_value_set_boxed (&val, hash);
variant = dbus_g_value_build_g_variant (&val);
g_value_unset (&val);
return variant;
}
/**
* nm_utils_connection_dict_to_hash:
* @dict: a #GVariant-serialized #NMConnection
*
* Returns: a #GHashTable equivalent to @dict.
*/
GHashTable *
nm_utils_connection_dict_to_hash (GVariant *dict)
{
GValue val = { 0, };
if (!dict)
return NULL;
dbus_g_value_parse_g_variant (dict, &val);
return g_value_get_boxed (&val);
}
/**
* nm_utils_setpgid:
* @unused: unused
@@ -2963,9 +2921,9 @@ nm_utils_g_value_set_object_path (GValue *value, gpointer object)
g_return_if_fail (!object || NM_IS_EXPORTED_OBJECT (object));
if (object && nm_exported_object_is_exported (object))
g_value_set_boxed (value, nm_exported_object_get_path (object));
g_value_set_string (value, nm_exported_object_get_path (object));
else
g_value_set_boxed (value, "/");
g_value_set_string (value, "/");
}
/**
@@ -2989,7 +2947,8 @@ nm_utils_g_value_set_object_path_array (GValue *value, GSList *objects)
continue;
g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (object)));
}
g_value_take_boxed (value, paths);
g_ptr_array_add (paths, NULL);
g_value_take_boxed (value, (char **) g_ptr_array_free (paths, FALSE));
}
/**