fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 17:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ifcfg-rh: avoid passing NULL error to connection_from_file_full()"

Browse source 
This reverts commit 35988ec633.

Since commit ffe0fde235,
wireless_connection_from_ifcfg() accepts a missing @error argument.
Revert this commit because the caller then can control whether to
log the error by providing @error.
This commit is contained in:
Thomas Haller 2015-01-06 15:50:35 +01:00
parent 4c629b0310
commit e4f32abfec
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -4827,18 +4827,13 @@ connection_from_file (const char *filename,
{
gboolean ignore_error = FALSE;
NMConnection *conn;
GError *local = NULL;
conn = connection_from_file_full (filename, NULL, NULL,
out_unhandled,
&local,
error,
&ignore_error);
if (local) {
if (!ignore_error)
PARSE_WARNING ("%s", local->message);
g_propagate_error (error, local);
}
if (error && *error && !ignore_error)
PARSE_WARNING ("%s", (*error)->message);
return conn;
}