diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-12-09 11:48:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-05 12:55:51 +0100 |
| commit | d9de31c1288c00e7e25ede2743387e76c35a1060 (patch) | |
| tree | 018aae28d9c33b6d52ee172211f73a0b11681c18 | |
| parent | 236063784ebc12da3a5d173774d6788df3f8c149 (diff) | |
| download | NetworkManager-d9de31c1288c00e7e25ede2743387e76c35a1060.tar.gz | |
core: log object type in nm_utils_log_connection_diff()
(cherry picked from commit 73703c4d1982f253e51325d1ed497eb12df1c313)
| -rw-r--r-- | src/NetworkManagerUtils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index b2049cf886..68c0dac303 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -2091,9 +2091,9 @@ nm_utils_log_connection_diff (NMConnection *connection, NMConnection *diff_base, connection_diff_are_same = nm_connection_diff (connection, diff_base, NM_SETTING_COMPARE_FLAG_EXACT | NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT, &connection_diff); if (connection_diff_are_same) { if (diff_base) - nm_log (level, domain, "%sconnection '%s' (%p and %p): no difference", prefix, name, connection, diff_base); + nm_log (level, domain, "%sconnection '%s' (%p/%s and %p/%s): no difference", prefix, name, connection, G_OBJECT_TYPE_NAME (connection), diff_base, G_OBJECT_TYPE_NAME (diff_base)); else - nm_log (level, domain, "%sconnection '%s' (%p): no properties set", prefix, name, connection); + nm_log (level, domain, "%sconnection '%s' (%p/%s): no properties set", prefix, name, connection, G_OBJECT_TYPE_NAME (connection)); g_assert (!connection_diff); return; } @@ -2128,9 +2128,9 @@ nm_utils_log_connection_diff (NMConnection *connection, NMConnection *diff_base, GError *err_verify = NULL; if (diff_base) - nm_log (level, domain, "%sconnection '%s' (%p < %p):", prefix, name, connection, diff_base); + nm_log (level, domain, "%sconnection '%s' (%p/%s < %p/%s):", prefix, name, connection, G_OBJECT_TYPE_NAME (connection), diff_base, G_OBJECT_TYPE_NAME (diff_base)); else - nm_log (level, domain, "%sconnection '%s' (%p):", prefix, name, connection); + nm_log (level, domain, "%sconnection '%s' (%p/%s):", prefix, name, connection, G_OBJECT_TYPE_NAME (connection)); print_header = FALSE; if (!nm_connection_verify (connection, &err_verify)) { |