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

cli: use an error quark for domain in g_set_error() instead of 0 (rh #842975)

Browse Source 
glib 2.32 makes a runtime check that domain is not NULL:
GLib-WARNING **: (gerror.c:390):g_error_new_valist: runtime check failed: (domain != 0)
This commit is contained in:
Jiří Klimeš
2012-07-25 13:57:45 +02:00
parent 1f4b97c878
commit 853803c2f0
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/src/connections.c
View File

@@ -1230,7 +1230,7 @@ find_device_for_connection (NmCli *nmc,
active = nm_device_get_active_connection (*device);
if (!active) {
g_set_error (error, 0, 0, _("no active connection on device '%s'"), iface);
g_set_error (error, NMCLI_ERROR, 0, _("no active connection on device '%s'"), iface);
return FALSE;
}
*spec_object = nm_object_get_path (NM_OBJECT (active));
@@ -1238,7 +1238,7 @@ find_device_for_connection (NmCli *nmc,
} else {
active = get_default_active_connection (nmc, device);
if (!active) {
g_set_error (error, 0, 0, _("no active connection or device"));
g_set_error_literal (error, NMCLI_ERROR, 0, _("no active connection or device"));
return FALSE;
}
*spec_object = nm_object_get_path (NM_OBJECT (active));
@@ -1309,9 +1309,11 @@ find_device_for_connection (NmCli *nmc,
return TRUE;
} else {
if (iface)
g_set_error (error, 0, 0, _("device '%s' not compatible with connection '%s'"), iface, nm_setting_connection_get_id (s_con));
g_set_error (error, NMCLI_ERROR, 0, _("device '%s' not compatible with connection '%s'"),
iface, nm_setting_connection_get_id (s_con));
else
g_set_error (error, 0, 0, _("no device found for connection '%s'"), nm_setting_connection_get_id (s_con));
g_set_error (error, NMCLI_ERROR, 0, _("no device found for connection '%s'"),
nm_setting_connection_get_id (s_con));
return FALSE;
}
}