X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=29ee3b28b5019b9b1c52bf57b94f9fd845e54e35;hb=f96fd73099713a39795b0b32c418f2af8818a96a;hp=591387fb50d082d754affd46c6ed98aae017fc68;hpb=5f69fb70c315fbbf79e435c88fabfb1b86be4b2a;p=xfce4-hdaps.git

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 591387f..29ee3b2 100644
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -22,6 +22,7 @@
 #include <config.h>
 #endif
 
+#include "hdaps.h"
 #include "xfce4-hdaps.h"
 #include "xfce4-hdaps-dialogs.h"
 
@@ -144,8 +145,26 @@ void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) {
 
 static void hdaps_set_defaults(HdapsPlugin *hdaps) {
   DBG("Configuring all settings to defaults.");
-  hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
+
+  /* Here we determine the default device name. There are essentially
+     two "defaults," one soft, and the other hard. The soft default
+     is to choose the first supported HDAPS device in the system. This
+     would benefit users who, for example, only have one supported drive
+     named hda. If we can't find any supported HDAPS devices, we use the
+     hard default of DEFAULT_DEVICE_NAME. */
+  char hdaps_devices[MAX_HDAPS_DEVICES][FILENAME_MAX];
+  int found_devices = get_hdaps_device_list(hdaps_devices);
+
+  if (found_devices > 0) {
+    hdaps->device_name = g_strdup(hdaps_devices[0]);
+  }
+  else {
+    hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
+  }
+
   snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
+
+  /* The other default is easier. */
   hdaps->poll_frequency = DEFAULT_POLL_FREQUENCY;
 }
 
@@ -334,6 +353,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);