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

[Landry Breuil]

Author: landry
Date: 2009-04-08 21:08:52 +0000 (Wed, 08 Apr 2009)
New Revision: 7143

Modified:
   xfce4-wavelan-plugin/trunk/panel-plugin/wi.h
   xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c
   xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c
Log:
Give up on the % vs dBm issue, add a ws_qunit
field with will be % on linux and dBm on BSDs,
may be refined one day.. all those drivers
with different ways of reporting signal strengh
definitely sucks.


Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wi.h
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wi.h	2009-04-08 15:45:08 UTC (rev 7142)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wi.h	2009-04-08 21:08:52 UTC (rev 7143)
@@ -34,7 +34,8 @@
 struct wi_stats
 {
   char  ws_netname[WI_MAXSTRLEN]; /* current SSID */
-  int   ws_quality;               /* current signal quality (percent) */
+  int   ws_quality;               /* current signal quality (percent or dBm) */
+  char  ws_qunit[4];              /* % or dBm ? */
   int   ws_rate;                  /* current rate (Mbps) */
   char  ws_vendor[WI_MAXSTRLEN];  /* device vendor name */
 };

Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c	2009-04-08 15:45:08 UTC (rev 7142)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wi_bsd.c	2009-04-08 21:08:52 UTC (rev 7143)
@@ -153,6 +153,7 @@
   /* clear stats first */
   bzero((void *)stats, sizeof(*stats));
 
+  g_strlcpy(stats->ws_qunit, "dBm", 4);
   /* check vendor (independent of carrier state) */
 #if defined(__FreeBSD__)
   if ((result = _wi_vendor(device, stats->ws_vendor, WI_MAXSTRLEN)) != WI_OK)

Modified: xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c
===================================================================
--- xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c	2009-04-08 15:45:08 UTC (rev 7142)
+++ xfce4-wavelan-plugin/trunk/panel-plugin/wi_linux.c	2009-04-08 21:08:52 UTC (rev 7143)
@@ -148,6 +148,7 @@
   g_return_val_if_fail(stats != NULL, WI_INVAL);
 
   /* FIXME */
+  g_strlcpy(stats->ws_qunit, "%", 2);
   g_strlcpy(stats->ws_vendor, "Unknown", WI_MAXSTRLEN);
 
   /* Set interface name */