Fixed a status update bug thanks to Evgeni Golov.

Added a new state constant, HDAPS_ON.
Changed hdaps_update_status to use the new constant when determining whether or not HDAPS has changed states from "on" to "off."

diff --git a/panel-plugin/hdaps.h b/panel-plugin/hdaps.h
index 2c900b2a93c3159a4a9417670e2d6d797129f5d1..7672b2488a1d2a7a54d8722fb2f85e2e94d48f2f 100644 (file)
--- a/panel-plugin/hdaps.h
+++ b/panel-plugin/hdaps.h
@@ -21,8 +21,9 @@
 #ifndef __HDAPS_H__
 #define __HDAPS_H__
 
-#define HDAPS_ERROR      -1
+#define HDAPS_ERROR     -1
 #define HDAPS_OFF        0
+#define HDAPS_ON         1
 #define UNLOAD_HEADS_FMT "/sys/block/%s/device/unload_heads"
 
 /* The most devices we'll consider. Gotta stop somewhere. */

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 591387fb50d082d754affd46c6ed98aae017fc68..8dbc74d1765dcbd997f7f999f7736faa962ba283 100644 (file)
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -334,6 +334,17 @@ static gboolean hdaps_update_status(HdapsPlugin *hdaps) {
   /* This just gets the status. */
   int status = parse_int_from_file(hdaps->sysfs_file);
 
+  /* The value in the sysfs_file represents the number of milliseconds
+   * that the drive heads will be parked. Of course, this will
+   * generally count down, and appear different each time we poll.
+   *
+   * So, to determine whether or not HDAPS has gone from "on"
+   * to "off," we treat all values greater than zero the same.
+  */
+  if (status > 0) {
+    status = HDAPS_ON;
+  }
+  
   if (status != hdaps->previous_status) {
     /* And we only update the icon if we need to. */
     hdaps_set_icon(hdaps, status);