From: Michael Orlitzky Date: Thu, 12 Feb 2009 04:53:11 +0000 (-0500) Subject: Made the default device name more intelligent. Now it will default to the first exist... X-Git-Tag: v0.0.5~1 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=6fba15ffe107eea1e665025a51a2c50b533da884;p=xfce4-hdaps.git Made the default device name more intelligent. Now it will default to the first existing HDAPS device, with "sda" as a fallback. --- diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c index 8dbc74d..e545326 100644 --- a/panel-plugin/xfce4-hdaps.c +++ b/panel-plugin/xfce4-hdaps.c @@ -144,8 +144,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; }