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

[carlosg svn gnome org]

Author: carlosg
Date: Mon Apr 14 13:24:54 2008
New Revision: 4229
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4229&view=rev

Log:
2008-04-14  Carlos Garnacho  <carlosg gnome org>

        * connection.c (connection_save): Apply modified patch from Ubuntu
        launchpad #185854. Mark interface as active if it wasn't previously
        configured, and as auto if it's been (or already was) activated. Fixes
        #526137.


Modified:
   trunk/src/network/ChangeLog
   trunk/src/network/connection.c

Modified: trunk/src/network/connection.c
==============================================================================
--- trunk/src/network/connection.c	(original)
+++ trunk/src/network/connection.c	Mon Apr 14 13:24:54 2008
@@ -802,8 +802,9 @@
 void
 connection_save (GstConnectionDialog *dialog)
 {
-  gboolean active;
+  gboolean active, was_configured;
 
+  was_configured = oobs_iface_get_configured (dialog->iface);
   active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->connection_configured));
 
   if (OOBS_IS_IFACE_PPP (dialog->iface))
@@ -819,6 +820,16 @@
     plip_dialog_save (dialog);
 
   oobs_iface_set_configured (dialog->iface, active);
+
+  if (!was_configured)
+    oobs_iface_set_active (dialog->iface, TRUE);
+
+  /* sync auto and active, this may happen either because
+   * it was just set active, or the interface was already
+   * manually configured, but not marked as auto.
+   */
+  if (oobs_iface_get_active (dialog->iface))
+    oobs_iface_set_auto (dialog->iface, TRUE);
 }
 
 void