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

libnm-glib: fix _nm_string_array_demarshal

Browse Source 
dbus-glib returns 'as' results as G_TYPE_STRV (NULL-terminated
char**), not DBUS_TYPE_G_ARRAY_OF_STRING (GPtrArray of char*).
This commit is contained in:
Dan Winship
2012-01-05 13:36:03 -05:00
committed by Dan Williams
parent c79b8085ee
commit e74d729f17
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libnm-glib/nm-types.c
View File

@@ -172,9 +172,9 @@ nm_string_array_get_type (void)
gboolean gboolean
_nm_string_array_demarshal (GValue *value, GPtrArray **dest) _nm_string_array_demarshal (GValue *value, GPtrArray **dest)
{ {
GPtrArray *array; char **array;
if (!G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_STRING)) if (!G_VALUE_HOLDS (value, G_TYPE_STRV))
return FALSE; return FALSE;
if (*dest) { if (*dest) {
@@ -182,13 +182,13 @@ _nm_string_array_demarshal (GValue *value, GPtrArray **dest)
*dest = NULL; *dest = NULL;
} }
array = (GPtrArray *) g_value_get_boxed (value); array = (char **) g_value_get_boxed (value);
if (array && array->len) { if (array && array[0]) {
int i; int i;
*dest = g_ptr_array_sized_new (array->len); *dest = g_ptr_array_new ();
for (i = 0; i < array->len; i++) for (i = 0; array[i]; i++)
g_ptr_array_add (*dest, g_strdup (g_ptr_array_index (array, i))); g_ptr_array_add (*dest, g_strdup (array[i]));
} }
return TRUE; return TRUE;