network-manager-applet r682 - trunk/src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Thu Apr 17 02:16:30 2008
New Revision: 682
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=682&view=rev

Log:
Don't try to free a NULL error

Modified:
   trunk/src/connection-editor/page-dsl.c
   trunk/src/connection-editor/page-mobile.c

Modified: trunk/src/connection-editor/page-dsl.c
==============================================================================
--- trunk/src/connection-editor/page-dsl.c	(original)
+++ trunk/src/connection-editor/page-dsl.c	Thu Apr 17 02:16:30 2008
@@ -85,7 +85,7 @@
 			value = g_hash_table_lookup (secrets, NM_SETTING_PPPOE_PASSWORD);
 			if (value)
 				password = (char *) g_value_get_string (value);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/connection-editor/page-mobile.c
==============================================================================
--- trunk/src/connection-editor/page-mobile.c	(original)
+++ trunk/src/connection-editor/page-mobile.c	Thu Apr 17 02:16:30 2008
@@ -98,7 +98,7 @@
 	                                      setting_name,
 	                                      FALSE,
 	                                      &error);
-	if (!secrets)
+	if (!secrets && error)
 		g_error_free (error);
 
 	return secrets;