diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-30 00:56:30 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-30 00:56:30 +0200 |
| commit | d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (patch) | |
| tree | fa41baf72753961e71dd8d5bdbe2b89c9109e4f1 /libnm-glib/nm-client.c | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Imported Upstream version 1.1.92 upstream/1.1.92
Diffstat (limited to 'libnm-glib/nm-client.c')
| -rw-r--r-- | libnm-glib/nm-client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index fc105e53..20112d69 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -513,7 +513,7 @@ activate_info_complete (ActivateInfo *info, error, info->user_data); } else if (error) - g_warning ("Device activation failed: (%d) %s", error->code, error->message); + g_warning ("Device activation failed: %s", error->message); priv->pending_activations = g_slist_remove (priv->pending_activations, info); } @@ -812,8 +812,8 @@ nm_client_deactivate_connection (NMClient *client, NMActiveConnection *active) DBUS_TYPE_G_OBJECT_PATH, path, G_TYPE_INVALID, G_TYPE_INVALID)) { - g_warning ("Could not deactivate connection '%s': %s", - path, error ? error->message : "(unknown)"); + g_warning ("Could not deactivate connection '%s': %s", + path, NM_G_ERROR_MSG (error)); g_clear_error (&error); } } @@ -1342,7 +1342,7 @@ free_devices (NMClient *client, gboolean in_dispose) if (all_devices && all_devices->len > 0) devices = all_devices; - else if (devices && devices->len > 0) + else if (real_devices && real_devices->len > 0) devices = real_devices; if (real_devices && devices != real_devices) { @@ -1839,8 +1839,8 @@ constructed (GObject *object) GError *error = NULL; if (!nm_utils_init (&error)) { - g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", - error->code, error->message); + g_warning ("Couldn't initilize nm-utils/crypto system: %s", + error->message); g_clear_error (&error); } |