From 8da9bfdbc16d5516ec6088f27088caac7780374f Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 27 Oct 2021 18:10:02 +0200 Subject: Use a blank line at most --- sensors-applet/active-sensor.c | 1 - sensors-applet/prefs-dialog.c | 10 ---------- sensors-applet/sensor-config-dialog.c | 3 --- sensors-applet/sensors-applet-plugin.h | 1 - sensors-applet/sensors-applet-sensor.h | 1 - sensors-applet/sensors-applet-settings.c | 4 ---- sensors-applet/sensors-applet.c | 4 ---- sensors-applet/sensors-applet.h | 3 --- 8 files changed, 27 deletions(-) (limited to 'sensors-applet') diff --git a/sensors-applet/active-sensor.c b/sensors-applet/active-sensor.c index 012d2b4..d273b1b 100644 --- a/sensors-applet/active-sensor.c +++ b/sensors-applet/active-sensor.c @@ -55,7 +55,6 @@ static const gchar * const temp_overlay_icons[] = { PIXMAPS_DIR "very-high-temp-icon.png" }; - static gdouble sensor_value_range_normalised(gdouble value, gdouble low_value, gdouble high_value) { diff --git a/sensors-applet/prefs-dialog.c b/sensors-applet/prefs-dialog.c index 5b511c8..58b839d 100644 --- a/sensors-applet/prefs-dialog.c +++ b/sensors-applet/prefs-dialog.c @@ -30,7 +30,6 @@ #define OLD_TEMP_SCALE 0 #define NEW_TEMP_SCALE 1 - /* when a user closes the prefs-dialog we assume that applet is now setup, so store all values in gsettings */ void prefs_dialog_close(SensorsApplet *sensors_applet) { @@ -86,7 +85,6 @@ void prefs_dialog_response(GtkDialog *prefs_dialog, } } - static gboolean prefs_dialog_convert_low_and_high_values(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, @@ -111,7 +109,6 @@ static gboolean prefs_dialog_convert_low_and_high_values(GtkTreeModel *model, scales[OLD_TEMP_SCALE], scales[NEW_TEMP_SCALE]); - gtk_tree_store_set(GTK_TREE_STORE(model), iter, LOW_VALUE_COLUMN, low_value, @@ -121,7 +118,6 @@ static gboolean prefs_dialog_convert_low_and_high_values(GtkTreeModel *model, return FALSE; } - static void prefs_dialog_timeout_changed(GtkSpinButton *button, PrefsDialog *prefs_dialog) { @@ -133,7 +129,6 @@ static void prefs_dialog_timeout_changed(GtkSpinButton *button, static void prefs_dialog_display_mode_changed(GtkComboBox *display_mode_combo_box, PrefsDialog *prefs_dialog) { - int display_mode; display_mode = gtk_combo_box_get_active(display_mode_combo_box); @@ -205,7 +200,6 @@ static void prefs_dialog_show_units_toggled (GtkCheckButton *show_units, PrefsDi sensors_applet_update_active_sensors (prefs_dialog->sensors_applet); } - #ifdef HAVE_LIBNOTIFY static void prefs_dialog_display_notifications_toggled(GtkCheckButton *display_notifications, PrefsDialog *prefs_dialog) { @@ -225,7 +219,6 @@ static void prefs_dialog_display_notifications_toggled(GtkCheckButton *display_n } #endif - static void prefs_dialog_graph_size_changed(GtkSpinButton *button, PrefsDialog *prefs_dialog) { @@ -427,7 +420,6 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { GTK_RESPONSE_CLOSE, NULL)); - gtk_window_set_icon_name(GTK_WINDOW(prefs_dialog->dialog), "mate-sensors-applet"); g_object_set(prefs_dialog->dialog, @@ -794,7 +786,6 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { "visible", VISIBLE_COLUMN, NULL); - gtk_tree_view_column_set_min_width(prefs_dialog->enable_column, 90); prefs_dialog->icon_column = gtk_tree_view_column_new_with_attributes(_("Icon"), @@ -928,6 +919,5 @@ void prefs_dialog_open(SensorsApplet *sensors_applet) { content_area = gtk_dialog_get_content_area (prefs_dialog->dialog); gtk_box_pack_start (GTK_BOX(content_area), GTK_WIDGET(prefs_dialog->notebook), TRUE, TRUE, 0); - gtk_widget_show_all(GTK_WIDGET(prefs_dialog->dialog)); } diff --git a/sensors-applet/sensor-config-dialog.c b/sensors-applet/sensor-config-dialog.c index 53f1bdd..ecf27b5 100644 --- a/sensors-applet/sensor-config-dialog.c +++ b/sensors-applet/sensor-config-dialog.c @@ -69,7 +69,6 @@ typedef struct { GtkSizeGroup *size_group; } SensorConfigDialog; - static void sensor_config_dialog_response(GtkDialog *dialog, gint response, gpointer data) { @@ -386,7 +385,6 @@ void sensor_config_dialog_create(SensorsApplet *sensors_applet) { -1); header_text = g_strdup_printf("%s - %s", _("Sensor Properties"), sensor_label); - config_dialog->dialog = GTK_DIALOG(gtk_dialog_new_with_buttons(header_text, GTK_WINDOW(sensors_applet->prefs_dialog->dialog), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -396,7 +394,6 @@ void sensor_config_dialog_create(SensorsApplet *sensors_applet) { GTK_RESPONSE_CLOSE, NULL)); - gtk_window_set_icon_name(GTK_WINDOW(config_dialog->dialog), "sensors-applet"); g_free(header_text); diff --git a/sensors-applet/sensors-applet-plugin.h b/sensors-applet/sensors-applet-plugin.h index 6ba04c0..5f48b48 100644 --- a/sensors-applet/sensors-applet-plugin.h +++ b/sensors-applet/sensors-applet-plugin.h @@ -27,7 +27,6 @@ GQuark sensors_applet_plugin_error_quark(void); /* for error handling */ #define SENSORS_APPLET_PLUGIN_ERROR (sensors_applet_plugin_error_quark()) - /** * Initialises the plugin, and returns the list of SensorsAppletSensorInfo * structs to create the sensors for this plugin from diff --git a/sensors-applet/sensors-applet-sensor.h b/sensors-applet/sensors-applet-sensor.h index 63954f5..ed874d1 100644 --- a/sensors-applet/sensors-applet-sensor.h +++ b/sensors-applet/sensors-applet-sensor.h @@ -61,5 +61,4 @@ typedef struct _SensorsAppletSensorInfo { gchar *graph_color; /* must be dynamically allocated */ } SensorsAppletSensorInfo; - #endif // SENSORS_APPLET_SENSOR_H diff --git a/sensors-applet/sensors-applet-settings.c b/sensors-applet/sensors-applet-settings.c index 3b69a61..1fb3750 100644 --- a/sensors-applet/sensors-applet-settings.c +++ b/sensors-applet/sensors-applet-settings.c @@ -38,7 +38,6 @@ /* gsettings gvariant type string for the array */ #define GSGVTSA "as" - gchar* sensors_applet_settings_get_unique_id (const gchar *interface, const gchar *id, const gchar *path) { gchar *unique_id = NULL; gchar *unique_id_hash = NULL; @@ -353,7 +352,6 @@ static gint sensors_applet_settings_sort_sensors_sort (SensorsApplet *sensors_ap } } - /* at this point the interfaces are sorted, the sensors are next */ /* set a to be the first sensor in the sensors tree, under the first if. iter */ if (a_is_first) { @@ -481,7 +479,6 @@ gboolean sensors_applet_settings_sort_sensors (SensorsApplet *sensors_applet) { sensors_applet_settings_print_sensors_tree (sensors_applet); #endif - for (i = 0; NULL != sensors_list[i]; i++) { /* first pass */ @@ -575,7 +572,6 @@ gboolean sensors_applet_settings_save_sensors (SensorsApplet *sensors_applet) { not_end_of_interfaces; not_end_of_interfaces = gtk_tree_model_iter_next(GTK_TREE_MODEL(sensors_applet->sensors), &interfaces_iter)) { - for (not_end_of_sensors = gtk_tree_model_iter_children(GTK_TREE_MODEL(sensors_applet->sensors), &sensors_iter, &interfaces_iter); not_end_of_sensors; not_end_of_sensors = gtk_tree_model_iter_next(GTK_TREE_MODEL(sensors_applet->sensors), &sensors_iter)) { diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c index 6a0a264..b680836 100644 --- a/sensors-applet/sensors-applet.c +++ b/sensors-applet/sensors-applet.c @@ -51,11 +51,9 @@ #define COLUMN_SPACING 2 #define ROW_SPACING 1 - /* builder for sensor sorting verification */ static GVariantBuilder gvb_sensors_hash_list; - /* callbacks for panel menu */ static void prefs_cb(GtkAction *action, gpointer *data) { @@ -1258,7 +1256,6 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { /* init gsettings */ sensors_applet->settings = mate_panel_applet_settings_new (sensors_applet->applet, "org.mate.sensors-applet"); - /* set up builder for sorting verification */ g_variant_builder_init (&gvb_sensors_hash_list, G_VARIANT_TYPE ("as")); @@ -1276,7 +1273,6 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { /* free hash array */ g_strfreev (sensors_applet->sensors_hash_array); - /* should have created sensors tree above, but if have not was because we couldn't find any sensors */ if (NULL == sensors_applet->sensors) { GtkWidget *label; diff --git a/sensors-applet/sensors-applet.h b/sensors-applet/sensors-applet.h index db42581..98473ed 100644 --- a/sensors-applet/sensors-applet.h +++ b/sensors-applet/sensors-applet.h @@ -59,7 +59,6 @@ static const gchar * const stock_icons[NUM_ICONS] = { #define UNITS_VOLTAGE _("V") #define UNITS_CURRENT _("A") - /* enumeration used to identify columns in the GtkTreeStore data structure */ enum { PATH_COLUMN = 0, @@ -83,7 +82,6 @@ enum { N_COLUMNS }; - /* for display mode */ typedef enum { DISPLAY_LABEL_WITH_VALUE = 0, @@ -145,7 +143,6 @@ struct _SensorsApplet { gboolean show_tooltip; }; - /* non-static function prototypes */ void sensors_applet_init(SensorsApplet *sensors_applet); void sensors_applet_sensor_enabled(SensorsApplet *sensors_applet, GtkTreePath *path); -- cgit v1.2.1