summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-11-24 14:56:09 -0600
committerDan Williams <dcbw@redhat.com>2014-11-24 14:59:41 -0600
commitb4973b85fc03c81e8a0c6c8527b4093124dbf99b (patch)
tree6f6c03cef18a3affc12c63aa9eae996abba748af
parent74d110a9326da1644788f16a4a6e3ed1631592e8 (diff)
downloadnetwork-manager-applet-b4973b85fc03c81e8a0c6c8527b4093124dbf99b.tar.gz
editor: fix error handling when requesting secrets from non-existent setting
When NM core switched over to libnm-core and errors were consolidated, the error name changed. Recognize the new one. Fixed an issue where editing any WWAN connection would fail because secrets for the PPP setting were requested (for GSM username/password) but connections aren't actually required to have a PPP setting if no user/password is required.
-rw-r--r--src/connection-editor/ce-page.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 001af304..bde329f9 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -325,6 +325,7 @@ ce_page_complete_init (CEPage *self,
/* Ignore missing settings errors */
if ( error
&& !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.Settings.InvalidSetting")
+ && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.Settings.Connection.SettingNotFound")
&& !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.AgentManager.NoSecrets")) {
emit_initialized (self, error);
return;