From 1f1050d08678907f98b1ac1bf4b3f80147a5a43c Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 19 Sep 2004 21:43:43 +0000 Subject: [PATCH] is a GtkRadioAction callback but behaved like a GtkToggleAction callback. 2004-09-19 Michael Natterer * app/actions/qmask-commands.c (qmask_invert_cmd_callback): is a GtkRadioAction callback but behaved like a GtkToggleAction callback. Fixes bug #152948. --- ChangeLog | 6 ++++++ app/actions/qmask-commands.c | 16 +++++++--------- app/actions/qmask-commands.h | 2 +- app/actions/quick-mask-commands.c | 16 +++++++--------- app/actions/quick-mask-commands.h | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2139315821..dec5b5d660 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-19 Michael Natterer + + * app/actions/qmask-commands.c (qmask_invert_cmd_callback): is a + GtkRadioAction callback but behaved like a GtkToggleAction + callback. Fixes bug #152948. + 2004-09-19 DindinX * plug-ins/common/bumpmap.c: use a GimpDrawablePreview instead of a diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index 1ad4bde9ba..b26c0c46b5 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -88,21 +88,19 @@ qmask_toggle_cmd_callback (GtkAction *action, void qmask_invert_cmd_callback (GtkAction *action, - gint value, + GtkAction *current, gpointer data) { GimpImage *gimage; + gint value; return_if_no_image (gimage, data); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - { - if (value != gimage->qmask_inverted) - { - gimp_image_qmask_invert (gimage); + value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)); - if (gimp_image_get_qmask_state (gimage)) - gimp_image_flush (gimage); - } + if (value != gimage->qmask_inverted) + { + gimp_image_qmask_invert (gimage); + gimp_image_flush (gimage); } } diff --git a/app/actions/qmask-commands.h b/app/actions/qmask-commands.h index 4daa36ae50..0e47bec2c1 100644 --- a/app/actions/qmask-commands.h +++ b/app/actions/qmask-commands.h @@ -23,7 +23,7 @@ void qmask_toggle_cmd_callback (GtkAction *action, gpointer data); void qmask_invert_cmd_callback (GtkAction *action, - gint value, + GtkAction *current, gpointer data); void qmask_configure_cmd_callback (GtkAction *action, gpointer data); diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index 1ad4bde9ba..b26c0c46b5 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -88,21 +88,19 @@ qmask_toggle_cmd_callback (GtkAction *action, void qmask_invert_cmd_callback (GtkAction *action, - gint value, + GtkAction *current, gpointer data) { GimpImage *gimage; + gint value; return_if_no_image (gimage, data); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - { - if (value != gimage->qmask_inverted) - { - gimp_image_qmask_invert (gimage); + value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)); - if (gimp_image_get_qmask_state (gimage)) - gimp_image_flush (gimage); - } + if (value != gimage->qmask_inverted) + { + gimp_image_qmask_invert (gimage); + gimp_image_flush (gimage); } } diff --git a/app/actions/quick-mask-commands.h b/app/actions/quick-mask-commands.h index 4daa36ae50..0e47bec2c1 100644 --- a/app/actions/quick-mask-commands.h +++ b/app/actions/quick-mask-commands.h @@ -23,7 +23,7 @@ void qmask_toggle_cmd_callback (GtkAction *action, gpointer data); void qmask_invert_cmd_callback (GtkAction *action, - gint value, + GtkAction *current, gpointer data); void qmask_configure_cmd_callback (GtkAction *action, gpointer data);