diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
| commit | 62f60df6b4966d4e3d7f478284768115ef150b20 (patch) | |
| tree | 259b574936077d87b88ed6d0429ba317078e0fcc /gtk/color_edit_dlg.c | |
| parent | 7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (diff) | |
From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27718
Diffstat (limited to 'gtk/color_edit_dlg.c')
| -rw-r--r-- | gtk/color_edit_dlg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index 5f2bc1faa7..7146f35114 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -405,12 +405,12 @@ edit_color_filter_ok_cb (GtkButton *button, color_filters = (GtkWidget *)g_object_get_data(G_OBJECT(button), COLOR_FILTERS_CL); colorf = (color_filter_t *)g_object_get_data(G_OBJECT(button), COLOR_FILTER); - if (colorf->filter_name != NULL) - g_free(colorf->filter_name); + g_free(colorf->filter_name); colorf->filter_name = filter_name; - if (colorf->filter_text != NULL) - g_free(colorf->filter_text); + + g_free(colorf->filter_text); colorf->filter_text = filter_text; + colorf->disabled = filter_disabled; gdkcolor_to_color_t(&colorf->fg_color, &new_fg_color); gdkcolor_to_color_t(&colorf->bg_color, &new_bg_color); |