From: Michael Orlitzky Date: Wed, 23 Oct 2019 15:33:01 +0000 (-0400) Subject: panel-plugin: whitespace cleanup. X-Git-Tag: v1.0.0~14 X-Git-Url: http://gitweb.michael.orlitzky.com/?p=xfce4-hdaps.git;a=commitdiff_plain;h=60ffd1d1b7266d9a030b2c864135ff444f0cb917 panel-plugin: whitespace cleanup. --- diff --git a/panel-plugin/hdaps.c b/panel-plugin/hdaps.c index c9a6831..4254d72 100644 --- a/panel-plugin/hdaps.c +++ b/panel-plugin/hdaps.c @@ -58,13 +58,13 @@ int get_hdaps_device_list(char list[MAX_HDAPS_DEVICES][FILENAME_MAX]) { * We start by getting every device in the sysfs * block device directory, and then eliminate those * which don't have an unload_heads entry. - */ + */ int list_idx = 0; DIR *dp; struct dirent *ep; dp = opendir(SYSFS_BLOCK_DEVICE_DIR); - + if (dp != NULL) { while ((ep = readdir(dp)) && list_idx < MAX_HDAPS_DEVICES) { /* This next test covers "." and ".." too. */ @@ -85,26 +85,26 @@ int get_hdaps_device_list(char list[MAX_HDAPS_DEVICES][FILENAME_MAX]) { int slurp_file(const char* filename, char* buf, int max_bytes) { /* This function just reads the contents of filename * into buf, and returns the number of bytes read. - */ + */ if (filename == NULL || buf == NULL) { /* HDAPS_SUPER_BAD_ERROR */ return HDAPS_ERROR; } - + /* Return an error value by default. */ int bytes_read = HDAPS_ERROR; int fd = open(filename, O_RDONLY); - + if (fd < 0) { /* open() didn't work. Report the error, and bail. */ fprintf(stderr, "open(%s): %s\n", filename, strerror(errno)); return HDAPS_ERROR; - } + } bytes_read = read(fd, buf, max_bytes-1); - + if (bytes_read < 0) { /* Why did we read fewer than 0 bytes? */ fprintf(stderr, "read(%s): %s\n", filename, strerror(errno)); @@ -113,13 +113,13 @@ int slurp_file(const char* filename, char* buf, int max_bytes) { /* Null-terminate buf if read() worked. */ buf[bytes_read] = 0; } - + if (close(fd)) { /* Oh hey we should be able to close the file, too. */ - fprintf(stderr, "close(%s): %s\n", filename, strerror(errno)); + fprintf(stderr, "close(%s): %s\n", filename, strerror(errno)); } - + return bytes_read; } @@ -129,7 +129,7 @@ int slurp_file(const char* filename, char* buf, int max_bytes) { int parse_int_from_file(const char* filename) { /* Read an integer from a file. We expect the file to contain an integer (although in string form). */ - + char buf[MAX_FILE_CONTENTS_SIZE]; int bytes_read = slurp_file(filename, buf, sizeof(buf)); diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index bacd540..26f454e 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -48,15 +48,15 @@ static void hdaps_configure_response(GtkWidget *dialog, /* Launch the user's web browser and direct them to the plugin's webpage. */ gboolean spawn_result = g_spawn_command_line_async("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL); - + if (G_UNLIKELY(spawn_result == FALSE)) { g_warning(_("Unable to open the following url: %s"), PLUGIN_WEBSITE); } - + return; } - + if (response == GTK_RESPONSE_OK) { /* This corresponds to the "Save" button, so we want to save any settings that may have changed. */ @@ -68,7 +68,7 @@ static void hdaps_configure_response(GtkWidget *dialog, hdaps_reset_timeout(hdaps); } - + /* Since there is already a "save" button, we should ignore any changes that were made if the user presses "cancel" instead. */ @@ -83,16 +83,16 @@ static void hdaps_configure_response(GtkWidget *dialog, void hdaps_configure(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { - + /* Here comes a bunch of GTK garbage to create the settings dialog. */ - + GtkWidget *dialog; GtkWidget *label; GtkWidget *vbox; GtkWidget *hbox; GtkSizeGroup *sg; - + /* Block the plugin menu while the configuration dialogue is open. Don't forget to unblock it before we close. */ @@ -121,12 +121,12 @@ void hdaps_configure(XfcePanelPlugin *plugin, g_signal_connect(G_OBJECT (dialog), "response", 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); - + /* Create size group to keep widgets aligned */ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -141,7 +141,7 @@ void hdaps_configure(XfcePanelPlugin *plugin, 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_box_pack_start(GTK_BOX(hbox), hdaps->sb_poll_frequency, FALSE, @@ -163,17 +163,17 @@ 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); - + /* This function takes an index, and 0 should be the first (only) index at this point. */ gtk_combo_box_set_active((GtkComboBox*)hdaps->cb_device_name, 0); - + /* Now loop through the list of available devices, adding each to the list as we go. */ char hdaps_devices[MAX_HDAPS_DEVICES][FILENAME_MAX]; int found_devices = get_hdaps_device_list(hdaps_devices); int list_idx = 0; - + for (list_idx = 0; list_idx < found_devices; list_idx++) { /* We don't want to add duplicate entries to the combo box. However, at this point, the current device name should be @@ -183,9 +183,9 @@ void hdaps_configure(XfcePanelPlugin *plugin, gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]); } } - + gtk_box_pack_start(GTK_BOX(hbox), hdaps->cb_device_name, FALSE, FALSE, 0); - + /* Show the dialog and all of its widgets. */ gtk_widget_show_all(dialog); } diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c index e5a781e..b00e48c 100644 --- a/panel-plugin/xfce4-hdaps.c +++ b/panel-plugin/xfce4-hdaps.c @@ -45,7 +45,7 @@ XFCE_PANEL_PLUGIN_REGISTER(hdaps_construct); void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { - + XfceRc *rc; gchar *file; @@ -68,15 +68,15 @@ void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { DBG("Failed to open the configuration file. Bailing."); return; } - - + + /* Write any user-configured values to the resource file. */ if (hdaps->device_name) { xfce_rc_write_entry(rc, "device_name", hdaps->device_name); } - + xfce_rc_write_int_entry(rc, "poll_frequency", hdaps->poll_frequency); - + /* close the rc file */ xfce_rc_close(rc); } @@ -113,7 +113,7 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { if (hdaps->icon) { gtk_widget_destroy(hdaps->icon); } - + if (icon) { hdaps->icon = gtk_image_new_from_pixbuf(icon); g_object_unref(G_OBJECT(icon)); @@ -124,7 +124,7 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { gtk_box_pack_start(GTK_BOX(hdaps->hvbox), GTK_WIDGET(hdaps->icon), FALSE, FALSE, 0); gtk_widget_show(hdaps->icon); - + return; } @@ -170,7 +170,7 @@ static void hdaps_set_defaults(HdapsPlugin *hdaps) { static void hdaps_read(HdapsPlugin *hdaps) { - + XfceRc *rc; gchar *file; const gchar *saved_device_name; @@ -183,7 +183,7 @@ static void hdaps_read(HdapsPlugin *hdaps) { DBG("Retaining default settings."); return; } - + /* Open the config file read-only. */ rc = xfce_rc_simple_open(file, TRUE); @@ -195,9 +195,9 @@ static void hdaps_read(HdapsPlugin *hdaps) { DBG("Retaining default settings."); return; } - + /* Read the settings, one at a time. */ - + /* We use saved_device_name here because we need to dupe the string after we read it in from the config file. */ @@ -211,7 +211,7 @@ static void hdaps_read(HdapsPlugin *hdaps) { hdaps->poll_frequency = xfce_rc_read_int_entry(rc, "poll_frequency", DEFAULT_POLL_FREQUENCY); - + /* And close the config file. */ xfce_rc_close(rc); } @@ -228,12 +228,12 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { /* The HdapsPlugin gets a copy of the XfcePanelPlugin. */ hdaps->plugin = plugin; - + /* Set default values right before reading in the user's settings. This way, hdaps_read() doesn't have to set defaults on error conditions. */ hdaps_set_defaults(hdaps); - + /* Read any user settings into the HdapsPlugin. */ hdaps_read(hdaps); @@ -265,7 +265,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { hdaps->previous_status = HDAPS_OFF; hdaps_set_icon(hdaps, HDAPS_OFF); hdaps_set_tooltip(hdaps, HDAPS_OFF); - + return hdaps; } @@ -273,7 +273,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { static void hdaps_free(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { - + GtkWidget *dialog; /* Destroy the dialog if it's still open. */ @@ -308,7 +308,7 @@ static void hdaps_free(XfcePanelPlugin *plugin, static void hdaps_orientation_changed(XfcePanelPlugin *plugin, GtkOrientation orientation, HdapsPlugin *hdaps) { - + /* Change the plugin's orientation. Basically magic to me. */ gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation); } @@ -318,7 +318,7 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin, static gboolean hdaps_size_changed(XfcePanelPlugin *plugin, gint size, HdapsPlugin *hdaps) { - + GtkOrientation orientation; /* Get the current orientation of the plugin. */ @@ -344,7 +344,7 @@ static gboolean hdaps_size_changed(XfcePanelPlugin *plugin, static gboolean hdaps_update_status(HdapsPlugin *hdaps) { /* This checks the status of HDAPS and updates the - widget accordingly. */ + widget accordingly. */ /* This just gets the status. */ int status = parse_int_from_file(hdaps->sysfs_file); @@ -359,14 +359,14 @@ static gboolean hdaps_update_status(HdapsPlugin *hdaps) { 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); hdaps_set_tooltip(hdaps, status); hdaps->previous_status = status; } - + return TRUE; } @@ -421,7 +421,7 @@ static void hdaps_construct(XfcePanelPlugin *plugin) { /* Show the "about" right-click menu item, and connect its event handler. */ - xfce_panel_plugin_menu_show_about(plugin); + xfce_panel_plugin_menu_show_about(plugin); g_signal_connect(G_OBJECT(plugin), "about", G_CALLBACK(hdaps_about), hdaps); diff --git a/panel-plugin/xfce4-hdaps.h b/panel-plugin/xfce4-hdaps.h index 9c1ac9c..08f54fb 100644 --- a/panel-plugin/xfce4-hdaps.h +++ b/panel-plugin/xfce4-hdaps.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS typedef struct { XfcePanelPlugin *plugin; - + /* Panel widgets */ GtkWidget *eventbox; GtkWidget *hvbox; @@ -44,19 +44,19 @@ typedef struct { /* Keep track of the previous status so we don't update the icon every poll_frequency for no reason. */ int previous_status; - + /* Settings */ gchar *device_name; gint poll_frequency; - + /* Pseudo-setting, updated whenever device_name is. */ char sysfs_file[FILENAME_MAX]; - - /* Configuration dialog widgets */ + + /* Configuration dialog widgets */ GtkWidget *sb_poll_frequency; /* Spinners on all our rides, yo. */ GtkWidget *cb_device_name; /* The "Device name" combo box. */ - - + + } HdapsPlugin; void hdaps_save(XfcePanelPlugin *plugin,