fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 15:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-09-27 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-vpnc-service-helper.c
		- (str_to_gvalue, addr_to_gvalue): ensure the GValues are zeroed when
			allocated so that they can be assigned a type later
		- (addr_list_to_gvalue): use a GArray rather than a GSList, dbus-glib
			seems ignorant of GSLists with G_TYPE_UINT elements



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2900 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-09-27 14:30:19 +00:00
parent b1bd00af07
commit 790c3844a1
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vpn-daemons/vpnc/ChangeLog
View file

@ -1,3 +1,11 @@
2007-09-27 Dan Williams <dcbw@redhat.com>
* src/nm-vpnc-service-helper.c
- (str_to_gvalue, addr_to_gvalue): ensure the GValues are zeroed when
allocated so that they can be assigned a type later
- (addr_list_to_gvalue): use a GArray rather than a GSList, dbus-glib
seems ignorant of GSLists with G_TYPE_UINT elements
2007-09-26 Dan Williams <dcbw@redhat.com>
* src/nm-vpnc-service.c

27
vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c
View file

@ -106,7 +106,7 @@ str_to_gvalue (const char *str, gboolean try_convert)
return NULL;
}
val = g_new (GValue, 1);
val = g_slice_new0 (GValue);
g_value_init (val, G_TYPE_STRING);
g_value_set_string (val, str);
@ -126,7 +126,7 @@ addr_to_gvalue (const char *str)
if (!inet_aton (str, &temp_addr))
return NULL;
val = g_new (GValue, 1);
val = g_slice_new0 (GValue);
g_value_init (val, G_TYPE_UINT);
g_value_set_uint (val, temp_addr.s_addr);
@ -139,29 +139,34 @@ addr_list_to_gvalue (const char *str)
GValue *val;
char **split;
int i;
struct in_addr temp_addr;
GSList *list = NULL;
GArray *array;
/* Empty */
if (!str || strlen (str) < 1)
return NULL;
split = g_strsplit (str, " ", -1);
if (g_strv_length (split) == 0)
return NULL;
array = g_array_sized_new (FALSE, TRUE, sizeof (GValue *), g_strv_length (split));
for (i = 0; split[i]; i++) {
if (inet_aton (split[i], &temp_addr))
list = g_slist_append (list, GUINT_TO_POINTER (temp_addr.s_addr));
else {
GValue * addr_val = addr_to_gvalue (split[i]);
if (addr_val) {
g_array_append_val (array, addr_val);
} else {
g_strfreev (split);
g_slist_free (list);
g_array_free (array, TRUE);
return NULL;
}
}
g_strfreev (split);
val = g_new0 (GValue, 1);
g_value_init (val, dbus_g_type_get_collection ("GSList", G_TYPE_UINT));
g_value_set_boxed (val, list);
val = g_slice_new0 (GValue);
g_value_init (val, DBUS_TYPE_G_UINT_ARRAY);
g_value_set_boxed (val, array);
return val;
}