applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify

Browse source 
2007-08-03  Jens Granseuer  <jensgr@gmx.net>

	* appearance-style.c: (color_button_clicked_cb): simplify

svn path=/trunk/; revision=7953
This commit is contained in:
Jens Granseuer 2007-08-03 18:44:42 +00:00 • committed by Jens Granseuer
parent 082539f97a
commit 379677ec2f
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/appearance/ChangeLog
View file

@ -1,3 +1,7 @@
2007-08-03 Jens Granseuer <jensgr@gmx.net>
* appearance-style.c: (color_button_clicked_cb): simplify
2007-08-01 Thomas Wood <thos@gnome.org> 2007-08-01 Thomas Wood <thos@gnome.org>
Path by: Dennis Cranston <dennis_cranston@yahoo.com> Path by: Dennis Cranston <dennis_cranston@yahoo.com>

27
capplets/appearance/appearance-style.c
View file

@ -250,9 +250,6 @@ check_color_schemes_enabled (GtkSettings *settings,
static void static void
color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data) color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data)
{ {
gchar *new_scheme;
GdkColor colors[NUM_SYMBOLIC_COLORS];
gchar *str[NUM_SYMBOLIC_COLORS + 1];
const gchar *widgets[NUM_SYMBOLIC_COLORS] = { const gchar *widgets[NUM_SYMBOLIC_COLORS] = {
"fg_colorbutton", "bg_colorbutton", "fg_colorbutton", "bg_colorbutton",
"text_colorbutton", "base_colorbutton", "text_colorbutton", "base_colorbutton",
@ -265,27 +262,27 @@ color_button_clicked_cb (GtkWidget *colorbutton, AppearanceData *data)
"tooltip_fg_color", "tooltip_bg_color" }; "tooltip_fg_color", "tooltip_bg_color" };
gint i; gint i;
GtkWidget *widget; GtkWidget *widget;
GdkColor color;
GString *scheme = g_string_new (NULL);
gchar *colstr;
for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i) { for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i) {
widget = glade_xml_get_widget (data->xml, widgets[i]); widget = glade_xml_get_widget (data->xml, widgets[i]);
gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &colors[i]); gtk_color_button_get_color (GTK_COLOR_BUTTON (widget), &color);
str[i] = g_strdup_printf ("%s:#%04x%04x%04x", colstr = gdk_color_to_string (&color);
labels[i], colors[i].red, colors[i].green, colors[i].blue); g_string_append_printf (scheme, "%s:%s\n", labels[i], colstr);
g_free (colstr);
} }
str[NUM_SYMBOLIC_COLORS] = NULL; /* remove the last newline */
g_string_truncate (scheme, scheme->len - 1);
new_scheme = g_strjoinv ("\n", str); /* Currently we assume this has only been called when one of the colors has
/* Currently we assume this has only been called when one of the colours has
* actually changed, so we don't check the original key first */ * actually changed, so we don't check the original key first */
gconf_client_set_string (data->client, COLOR_SCHEME_KEY, new_scheme, NULL); gconf_client_set_string (data->client, COLOR_SCHEME_KEY, scheme->str, NULL);
g_string_free (scheme, TRUE);
gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), TRUE); gtk_widget_set_sensitive (glade_xml_get_widget (data->xml, "color_scheme_defaults_button"), TRUE);
for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i)
g_free (str[i]);
g_free (new_scheme);
} }
static void static void