gnome-system-tools r4193 - trunk/src/network

[carlosg svn gnome org]

Author: carlosg
Date: Fri Feb 29 01:25:00 2008
New Revision: 4193
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4193&view=rev

Log:
2008-02-29  Carlos Garnacho  <carlosg gnome org>

        * network-locations.c (compare_interface) (save_interface): Take into
        account the case where OobsIfacePPP::ethernet is NULL. Fixes #519268.


Modified:
   trunk/src/network/ChangeLog
   trunk/src/network/network-locations.c

Modified: trunk/src/network/network-locations.c
==============================================================================
--- trunk/src/network/network-locations.c	(original)
+++ trunk/src/network/network-locations.c	Fri Feb 29 01:25:00 2008
@@ -589,14 +589,20 @@
 	  gchar *value1, *value2;
 
 	  value1 = g_key_file_get_string (key_file, name, prop->key, NULL);
+	  value2 = NULL;
+
 	  g_object_get (iface, prop->key, &ethernet, NULL);
-	  g_object_get (ethernet, "device", &value2, NULL);
+
+	  if (ethernet)
+	    {
+	      g_object_get (ethernet, "device", &value2, NULL);
+	      g_object_unref (ethernet);
+	    }
 
 	  equal = compare_string (value1, value2);
 
 	  g_free (value1);
 	  g_free (value2);
-	  g_object_unref (ethernet);
 	}
       else
 	g_assert_not_reached ();
@@ -1035,15 +1041,18 @@
       else if (prop->type == TYPE_ETHERNET)
 	{
 	  OobsIface *ethernet;
-	  gchar *value;
+	  gchar *value = NULL;
 
 	  g_object_get (iface, prop->key, &ethernet, NULL);
-	  g_object_get (ethernet, "device", &value, NULL);
 
-	  g_key_file_set_string (key_file, name, prop->key, value);
+	  if (ethernet)
+	    {
+	      g_object_get (ethernet, "device", &value, NULL);
+	      g_object_unref (ethernet);
+	    }
 
+	  g_key_file_set_string (key_file, name, prop->key, (value) ? value : "");
 	  g_free (value);
-	  g_object_unref (ethernet);
 	}
     }