[gnome-applet-netspeed/f14/master] Merge last change from F15 devel: - Fix incorrect labelling in Device Details dialog (#647060), ig

[Michael Schwendt]

commit 5376f493500cfc155a1a2d2e5f657d4d8ad639ff
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Feb 4 23:37:53 2011 +0100

    Merge last change from F15 devel:
    - Fix incorrect labelling in Device Details dialog (#647060),
      ignore "bits instead of bytes" setting for Bytes in/out labels.

 gnome-applet-netspeed.spec               |    9 ++++++++-
 netspeed_applet-0.16-details-bytes.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/gnome-applet-netspeed.spec b/gnome-applet-netspeed.spec
index b89b422..20fc5ab 100644
--- a/gnome-applet-netspeed.spec
+++ b/gnome-applet-netspeed.spec
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
 Version:        0.16
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -28,6 +28,8 @@ Patch1: netspeed_applet-0.16-copy-qualpixbufs.patch
 # g_signal_handler_is_connected says that the patch is good, but
 # is it sufficient to fix bz 600597?
 Patch2: netspeed_applet-0.16-disconnect-icon-theme-changed.patch
+# related to GNOME bz 574462 / Fedora #647060
+Patch3: netspeed_applet-0.16-details-bytes.patch
 
 %description
 netspeed is a little GNOME applet that shows the traffic on a
@@ -40,6 +42,7 @@ specified network device (for example eth0) in kbytes/s.
 %endif
 %patch1 -p1 -b .copy-qualpixbufs
 %patch2 -p1 -b .disconnect-icon-theme-changed
+%patch3 -p1 -b .details-bytes
 
 
 %build
@@ -97,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov  3 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-5
+- Fix incorrect labelling in Device Details dialog (#647060),
+  ignore "bits instead of bytes" setting for Bytes in/out labels.
+
 * Wed Aug 11 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-4
 - Correctly disconnect icon_theme_changed_cb (from upstream bz 600597).
 
diff --git a/netspeed_applet-0.16-details-bytes.patch b/netspeed_applet-0.16-details-bytes.patch
new file mode 100644
index 0000000..ad8261a
--- /dev/null
+++ b/netspeed_applet-0.16-details-bytes.patch
@@ -0,0 +1,18 @@
+diff -Nur netspeed_applet-0.16-orig/src/netspeed.c netspeed_applet-0.16/src/netspeed.c
+--- netspeed_applet-0.16-orig/src/netspeed.c	2010-06-05 16:02:11.000000000 +0200
++++ netspeed_applet-0.16/src/netspeed.c	2010-11-03 15:04:38.000000000 +0100
+@@ -674,12 +674,12 @@
+ 
+ 	/* Refresh the values of the Infodialog */
+ 	if (applet->inbytes_text) {
+-		inbytes = bytes_to_string((double)applet->devinfo.rx, FALSE, applet->show_bits);
++		inbytes = bytes_to_string((double)applet->devinfo.rx, FALSE, FALSE);
+ 		gtk_label_set_text(GTK_LABEL(applet->inbytes_text), inbytes);
+ 		g_free(inbytes);
+ 	}	
+ 	if (applet->outbytes_text) {
+-		outbytes = bytes_to_string((double)applet->devinfo.tx, FALSE, applet->show_bits);
++		outbytes = bytes_to_string((double)applet->devinfo.tx, FALSE, FALSE);
+ 		gtk_label_set_text(GTK_LABEL(applet->outbytes_text), outbytes);
+ 		g_free(outbytes);
+ 	}