Merge branch '1523-network-monitor-init-failure' into 'master'

gnetworkmonitornm: Set a GError properly on an error handling path

See merge request GNOME/glib!322
This commit is contained in:
Iain Lane 2018-09-13 14:27:56 +00:00
commit d2a1a4bf55

View File

@ -309,6 +309,8 @@ g_network_monitor_nm_initable_init (GInitable *initable,
if (!name_owner)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("NetworkManager not running"));
g_object_unref (proxy);
return FALSE;
}