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

libnm: fix properties-changed debug logging

Browse Source 
The code was mistakenly still using G_VALUE_TYPE_NAME() instead of
g_variant_get_type_string().

Also, refer to the properties with standard gtk-doc punctuation:
"TypeName:property-name".
This commit is contained in:
Dan Winship
2014-10-01 13:41:49 -04:00
parent 3b1528417a
commit 5c2d2eed30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libnm/nm-object.c
View File

@@ -1198,11 +1198,11 @@ handle_property_changed (NMObject *self, const char *dbus_name,
if (G_UNLIKELY (debug)) { if (G_UNLIKELY (debug)) {
char *s; char *s;
s = g_variant_print (value, FALSE); s = g_variant_print (value, FALSE);
dbgmsg ("PC: (%p) %s::%s => '%s' (%s%s%s)", dbgmsg ("PC: (%p) %s:%s => '%s' (%s%s%s)",
self, G_OBJECT_TYPE_NAME (self), self, G_OBJECT_TYPE_NAME (self),
prop_name, prop_name,
s, s,
G_VALUE_TYPE_NAME (value), g_variant_get_type_string (value),
pi->object_type ? " / " : "", pi->object_type ? " / " : "",
pi->object_type ? g_type_name (pi->object_type) : ""); pi->object_type ? g_type_name (pi->object_type) : "");
g_free (s); g_free (s);
@@ -1327,7 +1327,7 @@ demarshal_generic (NMObject *object,
HANDLE_TYPE (G_TYPE_LONG, G_VARIANT_TYPE_INT64, glong, g_variant_get_int64) HANDLE_TYPE (G_TYPE_LONG, G_VARIANT_TYPE_INT64, glong, g_variant_get_int64)
HANDLE_TYPE (G_TYPE_ULONG, G_VARIANT_TYPE_UINT64, gulong, g_variant_get_uint64) HANDLE_TYPE (G_TYPE_ULONG, G_VARIANT_TYPE_UINT64, gulong, g_variant_get_uint64)
} else { } else {
dbgmsg ("%s: %s/%s unhandled type %s.", dbgmsg ("%s: %s:%s unhandled type %s.",
__func__, __func__,
G_OBJECT_TYPE_NAME (object), G_OBJECT_TYPE_NAME (object),
pspec->name, pspec->name,
@@ -1339,9 +1339,9 @@ done:
if (success) { if (success) {
_nm_object_queue_notify (object, pspec->name); _nm_object_queue_notify (object, pspec->name);
} else { } else {
dbgmsg ("%s: %s/%s (type %s) couldn't be set with type %s.", dbgmsg ("%s: %s:%s (type %s) couldn't be set from D-Bus type %s.",
__func__, G_OBJECT_TYPE_NAME (object), pspec->name, __func__, G_OBJECT_TYPE_NAME (object), pspec->name,
g_type_name (pspec->value_type), G_VALUE_TYPE_NAME (value)); g_type_name (pspec->value_type), g_variant_get_type_string (value));
} }
return success; return success;
} }