From 2115cd7696fc8cdae3af00bab96b52e1c9f47fe0 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 28 Feb 2013 23:05:09 +0000 Subject: color_edit_dlg update: - Significantly simplify & rework code; - Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer. - Minor UI cleanup (default buttons & etc) - Fix crash which occurred in the (existing) GTK3 related code. - Fix some other relatively minor bugs (including some minor memory leaks); - Remove some old, commented-out code; - Use a more consistent naming scheme for certain variables. svn path=/trunk/; revision=47958 --- color_filters.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'color_filters.c') diff --git a/color_filters.c b/color_filters.c index 4fb1029517..3ee290b7de 100644 --- a/color_filters.c +++ b/color_filters.c @@ -78,15 +78,15 @@ color_filter_new(const gchar *name, /* The name of the filter to create { color_filter_t *colorf; - colorf = (color_filter_t *)g_malloc(sizeof (color_filter_t)); - colorf->filter_name = g_strdup(name); - colorf->filter_text = g_strdup(filter_string); - colorf->bg_color = *bg_color; - colorf->fg_color = *fg_color; - colorf->disabled = disabled; - colorf->c_colorfilter = NULL; - colorf->edit_dialog = NULL; - colorf->selected = FALSE; + colorf = (color_filter_t *)g_malloc(sizeof (color_filter_t)); + colorf->filter_name = g_strdup(name); + colorf->filter_text = g_strdup(filter_string); + colorf->bg_color = *bg_color; + colorf->fg_color = *fg_color; + colorf->disabled = disabled; + colorf->c_colorfilter = NULL; + colorf->color_edit_dlg_info = NULL; + colorf->selected = FALSE; return colorf; } @@ -249,15 +249,15 @@ color_filter_clone(color_filter_t *colorf) { color_filter_t *new_colorf; - new_colorf = (color_filter_t *)g_malloc(sizeof (color_filter_t)); - new_colorf->filter_name = g_strdup(colorf->filter_name); - new_colorf->filter_text = g_strdup(colorf->filter_text); - new_colorf->bg_color = colorf->bg_color; - new_colorf->fg_color = colorf->fg_color; - new_colorf->disabled = colorf->disabled; - new_colorf->c_colorfilter = NULL; - new_colorf->edit_dialog = NULL; - new_colorf->selected = FALSE; + new_colorf = (color_filter_t *)g_malloc(sizeof (color_filter_t)); + new_colorf->filter_name = g_strdup(colorf->filter_name); + new_colorf->filter_text = g_strdup(colorf->filter_text); + new_colorf->bg_color = colorf->bg_color; + new_colorf->fg_color = colorf->fg_color; + new_colorf->disabled = colorf->disabled; + new_colorf->c_colorfilter = NULL; + new_colorf->color_edit_dlg_info = NULL; + new_colorf->selected = FALSE; return new_colorf; } -- cgit v1.2.1