freeze breakage request

[Carlos Garnacho <carlosg gnome org>]

Hi release team,

I'm requesting permission for committing these two patches

The patch for gnome-system-tools is for handling correctly the network
interfaces status at boot time, since it was handled in the previous
stable releases of g-s-t, I'd say that it's a small regression.

The patch for system-tools-backends contains a fix for an annoying bug
that's mostly triggered by the first patch, in the current behavior, the
interfaces that have changed their configuration are enabled
automatically, but should not be enabled if it's disabled

Both patches have been tested to death, and the changes are pretty
trivial, may I commit them? :)

	Regards

? gnome-system-tools-1.1.92.tar.gz
? patch
Index: src/network/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-system-tools/src/network/ChangeLog,v
retrieving revision 1.283
diff -u -r1.283 ChangeLog
--- src/network/ChangeLog	1 Mar 2005 20:56:45 -0000	1.283
+++ src/network/ChangeLog	5 Mar 2005 15:52:17 -0000
@@ -1,3 +1,8 @@
+2005-03-05  Carlos Garnacho Parro  <carlosg gnome org>
+
+	* callbacks.c: make the "enabled" and "auto" interface values match 
+	as they	should
+
 2005-03-01  Carlos Garnacho Parro  <carlosg gnome org>
 
 	* Release 1.1.92
Index: src/network/callbacks.c
===================================================================
RCS file: /cvs/gnome/gnome-system-tools/src/network/callbacks.c,v
retrieving revision 1.121
diff -u -r1.121 callbacks.c
--- src/network/callbacks.c	1 Mar 2005 18:18:28 -0000	1.121
+++ src/network/callbacks.c	5 Mar 2005 15:52:18 -0000
@@ -33,6 +33,7 @@
   gboolean   success;
 
   success = gst_iface_enable (iface);
+  gst_iface_set_auto (iface, success);
 
   if (!success)
     {
@@ -337,7 +338,10 @@
       if (enable)
 	enable_iface (iface);
       else
-	gst_iface_disable (iface);
+        {
+	  gst_iface_disable (iface);
+	  gst_iface_set_auto (iface, FALSE);
+	}
 
       ifaces_model_modify_interface_at_iter (&iter);
       g_object_unref (iface);
@@ -348,6 +352,8 @@
       /* update gateway settings */
       if (gtk_combo_box_get_active (network_tool->gateways_list) == -1)
 	gtk_combo_box_set_active (network_tool->gateways_list, 0);
+
+      gst_dialog_modify (tool->main_dialog);
     }
 }
 

? aaa
? patch
? po2
? process.pl
? system-tools-backends-1.1.91.tar.gz
? system-tools-backends-1.1.92
? system-tools-backends-1.1.92.tar.gz
? m4macros/Makefile
? m4macros/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/system-tools-backends/ChangeLog,v
retrieving revision 1.776
diff -u -r1.776 ChangeLog
--- ChangeLog	1 Mar 2005 20:27:19 -0000	1.776
+++ ChangeLog	5 Mar 2005 15:45:45 -0000
@@ -1,3 +1,8 @@
+2005-03-05  Carlos Garnacho Parro  <carlosg gnome org>
+
+	* network.pl.in: don't activate the interface after having changed 
+	if it was left disabled
+
 2005-03-01  Carlos Garnacho Parro  <carlosg gnome org>
 
 	* Release 1.1.92
Index: network.pl.in
===================================================================
RCS file: /cvs/gnome/system-tools-backends/network.pl.in,v
retrieving revision 1.193
diff -u -r1.193 network.pl.in
--- network.pl.in	1 Mar 2005 01:22:43 -0000	1.193
+++ network.pl.in	5 Mar 2005 15:47:42 -0000
@@ -2488,6 +2488,7 @@
   my ($i, $j);
   my ($tmp, $res);
   my ($delete_proc, $set_proc);
+  my ($was_active);
 
   &gst_report_enter ();
   &gst_report ("network_ifaces_set");
@@ -2511,10 +2512,16 @@
     {
       if (&gst_network_interface_changed ($$values_hash{$i}, $$old_hash{$i}))
       {
+        $was_active = $$values_hash{$i}{"enabled"};
+
         &$set_proc ($$values_hash{$i}, $$old_hash{$i}, 0, 1);
         $tmp = &gst_network_interface_set ($i, $$values_hash{$i}, $$old_hash{$i});
         $res = $tmp if !$res;
-        &$set_proc ($$values_hash{$i}, $$old_hash{$i}, 1, 1);
+
+        if ($was_active == 1)
+        {
+          &$set_proc ($$values_hash{$i}, $$old_hash{$i}, 1, 1);
+        }
       }
     }
   }