X-Git-Url: http://gitweb.michael.orlitzky.com/?p=xfce4-hdaps.git;a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=4350023418990fb740315a689cc3f6d6f4ddef97;hp=b00e48c7dbba00ccc9bfa2126d7cb66e5264b993;hb=a6a355e5f1a8fcc4e46f10a1a828ffee3809e122;hpb=913e10bcfd5d4c7328691635313d07a4bfe2a0f2 diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c index b00e48c..4350023 100644 --- a/panel-plugin/xfce4-hdaps.c +++ b/panel-plugin/xfce4-hdaps.c @@ -94,19 +94,19 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { if (status == HDAPS_ERROR) { /* Error */ icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), - "emblem-noread", - size, 0, NULL); + "emblem-noread", + size, 0, NULL); } else if (status == HDAPS_OFF) { icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), - "drive-harddisk", - size, 0, NULL); + "drive-harddisk", + size, 0, NULL); } else { /* status > HDAPS_OFF means it's on. */ icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), - "emblem-nowrite", - size, 0, NULL); + "emblem-nowrite", + size, 0, NULL); } /* Get rid of the previous icon. */ @@ -119,10 +119,15 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { g_object_unref(G_OBJECT(icon)); } else { - hdaps->icon = gtk_image_new_from_icon_name("dialog-warning", GTK_ICON_SIZE_BUTTON); + hdaps->icon = gtk_image_new_from_icon_name("dialog-warning", + GTK_ICON_SIZE_BUTTON); } - gtk_box_pack_start(GTK_BOX(hdaps->hvbox), GTK_WIDGET(hdaps->icon), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hdaps->hvbox), + GTK_WIDGET(hdaps->icon), + FALSE, + FALSE, + 0); gtk_widget_show(hdaps->icon); return; @@ -162,7 +167,10 @@ static void hdaps_set_defaults(HdapsPlugin *hdaps) { hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME); } - snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->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; @@ -202,15 +210,18 @@ static void hdaps_read(HdapsPlugin *hdaps) { to dupe the string after we read it in from the config file. */ saved_device_name = xfce_rc_read_entry(rc, - "device_name", - DEFAULT_DEVICE_NAME); + "device_name", + DEFAULT_DEVICE_NAME); hdaps->device_name = g_strdup(saved_device_name); - snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name); + snprintf(hdaps->sysfs_file, + FILENAME_MAX, + UNLOAD_HEADS_FMT, + hdaps->device_name); /* Integers are easier. */ hdaps->poll_frequency = xfce_rc_read_int_entry(rc, - "poll_frequency", - DEFAULT_POLL_FREQUENCY); + "poll_frequency", + DEFAULT_POLL_FREQUENCY); /* And close the config file. */ xfce_rc_close(rc); @@ -272,7 +283,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { static void hdaps_free(XfcePanelPlugin *plugin, - HdapsPlugin *hdaps) { + HdapsPlugin *hdaps) { GtkWidget *dialog; @@ -306,8 +317,8 @@ static void hdaps_free(XfcePanelPlugin *plugin, static void hdaps_orientation_changed(XfcePanelPlugin *plugin, - GtkOrientation orientation, - HdapsPlugin *hdaps) { + GtkOrientation orientation, + HdapsPlugin *hdaps) { /* Change the plugin's orientation. Basically magic to me. */ gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation); @@ -316,8 +327,8 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin, static gboolean hdaps_size_changed(XfcePanelPlugin *plugin, - gint size, - HdapsPlugin *hdaps) { + gint size, + HdapsPlugin *hdaps) { GtkOrientation orientation; @@ -379,7 +390,9 @@ void hdaps_reset_timeout(HdapsPlugin *hdaps) { g_source_remove(hdaps->timeout); } - hdaps->timeout = g_timeout_add(hdaps->poll_frequency, (GSourceFunc)hdaps_update_status, hdaps); + hdaps->timeout = g_timeout_add(hdaps->poll_frequency, + (GSourceFunc)hdaps_update_status, + hdaps); } @@ -417,13 +430,13 @@ static void hdaps_construct(XfcePanelPlugin *plugin) { connect its event handler. */ xfce_panel_plugin_menu_show_configure(plugin); g_signal_connect(G_OBJECT(plugin), "configure-plugin", - G_CALLBACK(hdaps_configure), hdaps); + G_CALLBACK(hdaps_configure), hdaps); /* Show the "about" right-click menu item, and connect its event handler. */ xfce_panel_plugin_menu_show_about(plugin); g_signal_connect(G_OBJECT(plugin), "about", - G_CALLBACK(hdaps_about), hdaps); + G_CALLBACK(hdaps_about), hdaps); /* Set the timeout for the function which checks the HDAPS status. */