r16623 - in /desktop/unstable/gnome-system-tools/debian: changelog patches/61_network_auto.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jul 23 11:46:22 2008
New Revision: 16623

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16623
Log:
61_network_auto.patch: patch from Ubuntu/upstream to add "auto" line 
in /etc/network/interfaces when needed. Closes: #488250.

Added:
    desktop/unstable/gnome-system-tools/debian/patches/61_network_auto.patch
Modified:
    desktop/unstable/gnome-system-tools/debian/changelog
    desktop/unstable/gnome-system-tools/debian/patches/series

Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=16623&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog Wed Jul 23 11:46:22 2008
@@ -1,8 +1,13 @@
 gnome-system-tools (2.22.0-3) UNRELEASED; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * debian/control.in:
     - Improve gnome-system-tools' description. Thanks to James Westby.
       Closes: #488255.
+
+  [ Josselin Mouette ]
+  * 61_network_auto.patch: patch from Ubuntu/upstream to add "auto" line 
+    in /etc/network/interfaces when needed. Closes: #488250.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 08 Jul 2008 18:25:17 +0200
 

Added: desktop/unstable/gnome-system-tools/debian/patches/61_network_auto.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/61_network_auto.patch?rev=16623&op=file
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/61_network_auto.patch (added)
+++ desktop/unstable/gnome-system-tools/debian/patches/61_network_auto.patch Wed Jul 23 11:46:22 2008
@@ -1,0 +1,36 @@
+Debian #488250
+GNOME #526137
+Launchpad #185854
+
+Index: gnome-system-tools-2.22.0/src/network/connection.c
+===================================================================
+--- gnome-system-tools-2.22.0.orig/src/network/connection.c	2008-07-23 13:44:44.273367216 +0200
++++ gnome-system-tools-2.22.0/src/network/connection.c	2008-07-23 13:44:49.321368567 +0200
+@@ -802,8 +802,9 @@ connection_dialog_prepare (GstConnection
+ 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 @@ connection_save (GstConnectionDialog *di
+     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

Modified: desktop/unstable/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=16623&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/series (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series Wed Jul 23 11:46:22 2008
@@ -3,3 +3,4 @@
 40_more-groups.patch
 50_min-max-gid.patch
 60_save_crash.patch
+61_network_auto.patch