Bug#488250: gnome-network-admin: doesn't add auto line

[James Westby]

Package: gnome-network-admin
Version: 2.22.0-1
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-devel
Forwarded: http://bugzilla.gnome.org/show_bug.cgi?id=526137

Hi,

In some situations network-admin doesn't add an "auto" line to
/etc/network/interfaces. Please see

  http://bugzilla.gnome.org/show_bug.cgi?id=526137

and

  https://bugs.edge.launchpad.net/gst/+bug/185854

for all the details.

Attached is a patch plucked from svn to fix this issue. Please
consider applying it.

Thanks,

James


Index: ubuntu/src/network/connection.c
===================================================================
--- ubuntu.orig/src/network/connection.c	2008-06-24 12:04:27.000000000 +0100
+++ ubuntu/src/network/connection.c	2008-06-24 17:06:51.000000000 +0100
@@ -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