2008-03-12 Dan Williams <dcbw@redhat.com>

* src/nm-properties-changed-signal.c
		- (add_to_string): better handling of NULL objects



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3430 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-12 17:01:24 +00:00
parent 348cce0c20
commit a5a8aa0801
2 changed files with 19 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-03-12 Dan Williams <dcbw@redhat.com>
* src/nm-properties-changed-signal.c
- (add_to_string): better handling of NULL objects
2008-03-12 Dan Williams <dcbw@redhat.com>
Move the 'carrier' property from NMDevice to NMDevice8023Ethernet;

View file

@ -55,9 +55,21 @@ add_to_string (gpointer key, gpointer value, gpointer user_data)
GValue str_val = { 0, };
g_value_init (&str_val, G_TYPE_STRING);
g_value_transform ((GValue *) value, &str_val);
if (!g_value_transform ((GValue *) value, &str_val)) {
if (G_VALUE_HOLDS_OBJECT (value)) {
GObject *obj = g_value_get_object (value);
sprintf (buf + strlen (buf), "{%s: %s}, ", (const char *) key, g_value_get_string (&str_val));
if (g_value_get_object (value)) {
sprintf (buf + strlen (buf), "{%s: %p (%s)}, ",
(const char *) key, obj, G_OBJECT_TYPE_NAME (obj));
} else {
sprintf (buf + strlen (buf), "{%s: %p}, ", (const char *) key, obj);
}
} else
sprintf (buf + strlen (buf), "{%s: <transform error>}, ", (const char *) key);
} else {
sprintf (buf + strlen (buf), "{%s: %s}, ", (const char *) key, g_value_get_string (&str_val));
}
g_value_unset (&str_val);
}
#endif