From a6a355e5f1a8fcc4e46f10a1a828ffee3809e122 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 26 Oct 2019 11:04:08 -0400 Subject: [PATCH] panel-plugin: whitespace cleanup; wrap lines and make tabs be spaces. --- panel-plugin/hdaps.c | 4 +- panel-plugin/xfce4-hdaps-dialogs.c | 79 ++++++++++++++++-------------- panel-plugin/xfce4-hdaps.c | 57 ++++++++++++--------- 3 files changed, 80 insertions(+), 60 deletions(-) diff --git a/panel-plugin/hdaps.c b/panel-plugin/hdaps.c index 4254d72..776477d 100644 --- a/panel-plugin/hdaps.c +++ b/panel-plugin/hdaps.c @@ -69,8 +69,8 @@ int get_hdaps_device_list(char list[MAX_HDAPS_DEVICES][FILENAME_MAX]) { while ((ep = readdir(dp)) && list_idx < MAX_HDAPS_DEVICES) { /* This next test covers "." and ".." too. */ if (hdaps_device_exists(ep->d_name)) { - strncpy(list[list_idx], ep->d_name, FILENAME_MAX); - list_idx++; + strncpy(list[list_idx], ep->d_name, FILENAME_MAX); + list_idx++; } } diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index 0bf63d8..6a7fff9 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -41,8 +41,8 @@ static void hdaps_configure_response(GtkWidget *dialog, - gint response, - HdapsPlugin *hdaps) { + gint response, + HdapsPlugin *hdaps) { if (response == GTK_RESPONSE_HELP) { /* Launch the user's web browser and direct them to @@ -63,7 +63,10 @@ static void hdaps_configure_response(GtkWidget *dialog, g_object_set_data(G_OBJECT(hdaps->plugin), "dialog", NULL); hdaps->poll_frequency = gtk_spin_button_get_value_as_int((GtkSpinButton*)hdaps->sb_poll_frequency); hdaps->device_name = gtk_combo_box_text_get_active_text((GtkComboBoxText*)hdaps->cb_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); hdaps_save(hdaps->plugin, hdaps); hdaps_reset_timeout(hdaps); } @@ -82,7 +85,7 @@ static void hdaps_configure_response(GtkWidget *dialog, void hdaps_configure(XfcePanelPlugin *plugin, - HdapsPlugin *hdaps) { + HdapsPlugin *hdaps) { /* Here comes a bunch of GTK garbage to create the settings dialog. */ @@ -99,13 +102,14 @@ void hdaps_configure(XfcePanelPlugin *plugin, xfce_panel_plugin_block_menu(plugin); /* Create the dialog */ - dialog = xfce_titled_dialog_new_with_buttons(_("Hdaps Plugin"), - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT, - "gtk-help", GTK_RESPONSE_HELP, - "gtk-save", GTK_RESPONSE_OK, - "gtk-cancel", GTK_RESPONSE_CANCEL, - NULL); + dialog = xfce_titled_dialog_new_with_buttons( + _("Hdaps Plugin"), + GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), + GTK_DIALOG_DESTROY_WITH_PARENT, + "gtk-help", GTK_RESPONSE_HELP, + "gtk-save", GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + NULL); /* Center the dialog on screen. */ gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); @@ -119,13 +123,13 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* Connect the reponse signal to the dialog. */ g_signal_connect(G_OBJECT (dialog), "response", - G_CALLBACK(hdaps_configure_response), hdaps); + G_CALLBACK(hdaps_configure_response), hdaps); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, DEFAULT_BORDER_WIDTH); gtk_container_set_border_width(GTK_CONTAINER(vbox), DEFAULT_BORDER_WIDTH - 2); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), - vbox, TRUE, TRUE, 0); + vbox, TRUE, TRUE, 0); /* Create size group to keep widgets aligned */ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -140,13 +144,14 @@ void hdaps_configure(XfcePanelPlugin *plugin, gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); hdaps->sb_poll_frequency = gtk_spin_button_new_with_range(100, 5000, 100); - gtk_spin_button_set_value((GtkSpinButton*)hdaps->sb_poll_frequency, hdaps->poll_frequency); + gtk_spin_button_set_value((GtkSpinButton*)hdaps->sb_poll_frequency, + hdaps->poll_frequency); gtk_box_pack_start(GTK_BOX(hbox), - hdaps->sb_poll_frequency, - FALSE, - FALSE, - 0); + hdaps->sb_poll_frequency, + FALSE, + FALSE, + 0); /* Create the device name dropdown. */ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, DEFAULT_BORDER_WIDTH); @@ -162,7 +167,8 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* Add the current device name, it should always be available. Oh, and it should be the default, too. */ - gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps->device_name); + gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, + hdaps->device_name); /* This function takes an index, and 0 should be the first (only) index at this point. */ @@ -180,7 +186,8 @@ void hdaps_configure(XfcePanelPlugin *plugin, the only entry. Therefore, to avoid duplicates, we only have to avoid adding the current device name a second time. */ if (strcmp(hdaps_devices[list_idx], hdaps->device_name) != 0) { - gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]); + gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, + hdaps_devices[list_idx]); } } @@ -195,8 +202,8 @@ void hdaps_configure(XfcePanelPlugin *plugin, /* URI (http(s):// and mailto://) handler used on the About dialog. */ static void hdaps_uri_handler(GtkAboutDialog *about, - const gchar *uri, - gpointer data) { + const gchar *uri, + gpointer data) { gchar *cmd; cmd = g_strdup_printf("%s %s","xdg-open", uri); @@ -218,20 +225,20 @@ void hdaps_about(XfcePanelPlugin *plugin) { default behavior apparently needs gio/gvfs to work, and I don't have those installed. */ g_signal_connect(plugin, - "activate-link", - G_CALLBACK(hdaps_uri_handler), - NULL); + "activate-link", + G_CALLBACK(hdaps_uri_handler), + NULL); gtk_show_about_dialog(NULL, - "authors", authors, - "copyright", copyright, - "destroy-with-parent", TRUE, - "license", LICENSE_AGPL3, - "logo-icon-name", PACKAGE_NAME, - "icon-name", PACKAGE_NAME, - "program-name", PACKAGE_NAME, - "version", PACKAGE_VERSION, - "website", PLUGIN_WEBSITE, - "website-label", "xfce4-hdaps homepage", - NULL); + "authors", authors, + "copyright", copyright, + "destroy-with-parent", TRUE, + "license", LICENSE_AGPL3, + "logo-icon-name", PACKAGE_NAME, + "icon-name", PACKAGE_NAME, + "program-name", PACKAGE_NAME, + "version", PACKAGE_VERSION, + "website", PLUGIN_WEBSITE, + "website-label", "xfce4-hdaps homepage", + NULL); } 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. */ -- 2.43.2