network-manager-applet r1034 - in trunk: . src/gconf-helpers

[dcbw svn gnome org]

Author: dcbw
Date: Wed Nov 19 15:11:42 2008
New Revision: 1034
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1034&view=rev

Log:
2008-11-19  Dan Williams  <dcbw redhat com>

	* src/gconf-helpers/nma-gconf-connection.c
		- (nma_gconf_connection_changed): handle error returned from
			nm_connection_replace_settings()



Modified:
   trunk/ChangeLog
   trunk/src/gconf-helpers/nma-gconf-connection.c

Modified: trunk/src/gconf-helpers/nma-gconf-connection.c
==============================================================================
--- trunk/src/gconf-helpers/nma-gconf-connection.c	(original)
+++ trunk/src/gconf-helpers/nma-gconf-connection.c	Wed Nov 19 15:11:42 2008
@@ -144,7 +144,6 @@
 		           __func__, priv->dir,
 		           g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)),
 		           error->message, error->code);
-		g_error_free (error);
 		goto invalid;
 	}
 	utils_clear_filled_connection_certs (gconf_connection);
@@ -154,7 +153,14 @@
 		return TRUE;
 
 	new_settings = nm_connection_to_hash (gconf_connection);
-	nm_connection_replace_settings (wrapped_connection, new_settings);
+	if (!nm_connection_replace_settings (wrapped_connection, new_settings, &error)) {
+		g_warning ("%s: '%s' / '%s' invalid: %d",
+		           __func__,
+		           error ? g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)) : "(none)",
+		           (error && error->message) ? error->message : "(none)",
+		           error ? error->code : -1);
+		goto invalid;
+	}
 	g_object_unref (gconf_connection);
 
 	fill_vpn_user_name (wrapped_connection);
@@ -168,6 +174,7 @@
 	return TRUE;
 
 invalid:
+	g_clear_error (&error);
 	nm_exported_connection_signal_removed (NM_EXPORTED_CONNECTION (self));
 	return FALSE;
 }