From d2ef616e51b476fba3e6f8d647b07a6540dabf6c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 18 Sep 2008 13:31:11 +0000 Subject: [PATCH] Fill error when object isn't a connection (Alexander Sack) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4074 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- libnm-util/nm-connection.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 3064e3488..876e86610 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -458,10 +458,17 @@ nm_connection_verify (NMConnection *connection, GError **error) NMSetting *s_con; VerifySettingsInfo info; - g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); if (error) g_return_val_if_fail (*error == NULL, FALSE); + if (!NM_IS_CONNECTION (connection)) { + g_set_error (error, + NM_SETTING_CONNECTION_ERROR, + NM_SETTING_CONNECTION_ERROR_UNKNOWN, + "invalid connection; failed verification"); + g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); + } + priv = NM_CONNECTION_GET_PRIVATE (connection); /* First, make sure there's at least 'connection' setting */