rpms/gnome-applet-netspeed/F-12 netspeed_applet-0.15.2-prefs-device.patch, NONE, 1.1 gnome-applet-netspeed.spec, 1.21, 1.22

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2289/F-12

Modified Files:
	gnome-applet-netspeed.spec 
Added Files:
	netspeed_applet-0.15.2-prefs-device.patch 
Log Message:
* Sat May  1 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.15.2-3.3
- Fix preferences Network device combobox active value.


netspeed_applet-0.15.2-prefs-device.patch:
 netspeed.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netspeed_applet-0.15.2-prefs-device.patch ---
diff -Nur netspeed_applet-0.15.2-orig/src/netspeed.c netspeed_applet-0.15.2/src/netspeed.c
--- netspeed_applet-0.15.2-orig/src/netspeed.c	2008-09-13 21:59:52.000000000 +0200
+++ netspeed_applet-0.15.2/src/netspeed.c	2010-05-01 12:30:32.000000000 +0200
@@ -1022,7 +1022,7 @@
 	/* Default means device with default route set */
 	gtk_combo_box_append_text(GTK_COMBO_BOX(applet->network_device_combo), _("Default"));
 	ptr = devices = get_available_devices();
-	for (i = 0; ptr; ptr = g_list_next(ptr)) {
+	for (i = 1; ptr; ptr = g_list_next(ptr)) {  /* 0 = Default device! */
 		gtk_combo_box_append_text(GTK_COMBO_BOX(applet->network_device_combo), ptr->data);
 		if (g_str_equal(ptr->data, applet->devinfo.name)) active = i;
 		++i;


Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-12/gnome-applet-netspeed.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-applet-netspeed.spec	14 Apr 2010 17:31:42 -0000	1.21
+++ gnome-applet-netspeed.spec	1 May 2010 10:46:37 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
 Version:        0.15.2
-Release:        3%{?dist}.2
+Release:        3%{?dist}.3
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -15,10 +15,14 @@ Patch0: netspeed_applet-0.15.2-follow-de
 Patch1: netspeed_applet-0.15.2-icon-theme-update.patch
 # GNOME bz 567079
 Patch2: netspeed_applet-0.15.2-wireless-quality.patch
-# don't exceed array boundaries for applet->in_graph (read access)
-# and arrays in_points/out_points (write access)
+# don't exceed array boundaries for applet->in_graph
+# and arrays in_points/out_points
 # plus: center graph a bit more horizontally
+# submitted upstream: GNOME bz 617363
 Patch3: netspeed_applet-0.15.2-graph.patch
+# fix preferences "Network device" combobox active value
+# submitted upstream: GNOME bz 598674
+Patch4: netspeed_applet-0.15.2-prefs-device.patch
 
 BuildRequires:  pkgconfig, gettext, scrollkeeper, intltool
 BuildRequires:  libgtop2-devel
@@ -41,6 +45,7 @@ specified network device (for example et
 %patch1 -p1 -b .icon-theme-update
 %patch2 -p1 -b .wireless-quality
 %patch3 -p1 -b .graph-issues
+%patch4 -p1 -b .prefs-device
 
 
 %build
@@ -96,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Sat May  1 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.15.2-3.3
+- Fix preferences Network device combobox active value.
+
 * Wed Apr 14 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.15.2-3.2
 - Fix out-of-bounds array access for the in/out graph,
   and center it a bit more horizontally.