summaryrefslogtreecommitdiff
path: root/multiload/src/properties.c
diff options
context:
space:
mode:
Diffstat (limited to 'multiload/src/properties.c')
-rw-r--r--multiload/src/properties.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/multiload/src/properties.c b/multiload/src/properties.c
index 37cc8bf2..e776b7b8 100644
--- a/multiload/src/properties.c
+++ b/multiload/src/properties.c
@@ -32,7 +32,6 @@ hard_set_sensitive (GtkWidget *w, gboolean sensitivity)
GINT_TO_POINTER ( ! sensitivity));
}
-
/* set sensitive, but always insensitive if NEVER_SENSITIVE is set */
static void
soft_set_sensitive (GtkWidget *w, gboolean sensitivity)
@@ -147,7 +146,6 @@ on_net_threshold1_spin_button_value_changed (GtkSpinButton *spin_button,
g_settings_set_uint64 (ma->settings, KEY_NET_THRESHOLD1, ma->net_threshold1);
}
-
static void
on_net_threshold2_spin_button_value_changed (GtkSpinButton *spin_button,
gpointer user_data)
@@ -167,7 +165,6 @@ on_net_threshold2_spin_button_value_changed (GtkSpinButton *spin_button,
g_settings_set_uint64 (ma->settings, KEY_NET_THRESHOLD2, ma->net_threshold2);
}
-
static void
on_net_threshold3_spin_button_value_changed (GtkSpinButton *spin_button,
gpointer user_data)
@@ -526,12 +523,13 @@ read_color_button (GtkWidget *widget,
GdkRGBA color;
gchar *color_string;
- if ((color_string = g_settings_get_string (settings, key)) != NULL) {
+ color_string = g_settings_get_string (settings, key);
+ if (*color_string != '\0') {
gdk_rgba_parse (&color, color_string);
- g_free (color_string);
} else {
gdk_rgba_parse (&color, "#000000");
}
+ g_free (color_string);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (widget), &color);
if (!g_settings_is_writable (settings, key))