network-manager-applet r683 - trunk/src/wireless-security

[dcbw svn gnome org]

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

Log:
quiet error message by not trying to free NULL GError

Modified:
   trunk/src/wireless-security/eap-method-leap.c
   trunk/src/wireless-security/eap-method-simple.c
   trunk/src/wireless-security/eap-method-tls.c
   trunk/src/wireless-security/ws-leap.c
   trunk/src/wireless-security/ws-wep-key.c
   trunk/src/wireless-security/ws-wpa-psk.c

Modified: trunk/src/wireless-security/eap-method-leap.c
==============================================================================
--- trunk/src/wireless-security/eap-method-leap.c	(original)
+++ trunk/src/wireless-security/eap-method-leap.c	Thu Apr 17 15:02:21 2008
@@ -179,7 +179,7 @@
 			if (value)
 				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/wireless-security/eap-method-simple.c
==============================================================================
--- trunk/src/wireless-security/eap-method-simple.c	(original)
+++ trunk/src/wireless-security/eap-method-simple.c	Thu Apr 17 15:02:21 2008
@@ -197,7 +197,7 @@
 			if (value)
 				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/wireless-security/eap-method-tls.c
==============================================================================
--- trunk/src/wireless-security/eap-method-tls.c	(original)
+++ trunk/src/wireless-security/eap-method-tls.c	Thu Apr 17 15:02:21 2008
@@ -420,7 +420,7 @@
 			if (value)
 				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/wireless-security/ws-leap.c
==============================================================================
--- trunk/src/wireless-security/ws-leap.c	(original)
+++ trunk/src/wireless-security/ws-leap.c	Thu Apr 17 15:02:21 2008
@@ -173,7 +173,7 @@
 			if (value)
 				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/wireless-security/ws-wep-key.c
==============================================================================
--- trunk/src/wireless-security/ws-wep-key.c	(original)
+++ trunk/src/wireless-security/ws-wep-key.c	Thu Apr 17 15:02:21 2008
@@ -335,7 +335,7 @@
 				strcpy (sec->keys[3], g_value_get_string (value));
 
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}
 

Modified: trunk/src/wireless-security/ws-wpa-psk.c
==============================================================================
--- trunk/src/wireless-security/ws-wpa-psk.c	(original)
+++ trunk/src/wireless-security/ws-wpa-psk.c	Thu Apr 17 15:02:21 2008
@@ -204,7 +204,7 @@
 			if (value)
 				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
 			g_hash_table_destroy (secrets);
-		} else
+		} else if (error)
 			g_error_free (error);
 	}