[Goodies-commits] r5145 - xfce4-wavelan-plugin/trunk/panel-plugin

[Landry Breuil]

Author: landry
Date: 2008-07-20 11:03:36 +0000 (Sun, 20 Jul 2008)
New Revision: 5145

Modified:
   xfce4-wavelan-plugin/trunk/panel-plugin/wavelan.c
   xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c
Log:
Transform bitrate in Mb/s in Linux part.
Properly fix units for tooltip : quality is a percentage and rate is in Mb/s.
I still have to figure how to compute correct signal quality on *bsd.


Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wavelan.c
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wavelan.c	2008-07-19 22:24:08 UTC (rev 5144)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wavelan.c	2008-07-20 11:03:36 UTC (rev 5145)
@@ -219,9 +219,9 @@
         wavelan_set_state(wavelan, STATE_LINK0);
 
       if (strlen(stats.ws_netname) > 0)
-        tip = g_strdup_printf("%s: %ddB at %ddBm", stats.ws_netname, stats.ws_quality, stats.ws_rate);
+        tip = g_strdup_printf("%s: %d%% at %dMb/s", stats.ws_netname, stats.ws_quality, stats.ws_rate / 1000000);
       else
-        tip = g_strdup_printf("%ddB at %ddBm", stats.ws_quality, stats.ws_rate);
+        tip = g_strdup_printf("%d%% at %dMb/s", stats.ws_quality, stats.ws_rate / 1000000);
     }
   }
   else {

Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c	2008-07-19 22:24:08 UTC (rev 5144)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c	2008-07-20 11:03:36 UTC (rev 5145)
@@ -173,7 +173,8 @@
     stats->ws_rate = 0;
   } else {
     TRACE ("Bit-rate is %d", wreq.u.bitrate.value);
-    stats->ws_rate = wreq.u.bitrate.value;
+    /* bitrate is in b/s, transform to Mb/s */
+    stats->ws_rate = wreq.u.bitrate.value / (1024 * 1024);
   }
 
 #if WIRELESS_EXT > 11