Commit d212161c authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/core/gimp-utils.[ch] app/core/gimp.c app/widgets/gimpcontrollerinfo.c

2007-02-17  Michael Natterer  <mitch@gimp.org>

	* app/core/gimp-utils.[ch]
	* app/core/gimp.c
	* app/widgets/gimpcontrollerinfo.c
	* libgimpwidgets/gimpcontroller.c: removed various boolean_handled
	signal accumulators and use g_signal_accumulator_true_handled().


svn path=/trunk/; revision=21933
parent d737e1cd
2007-02-17 Michael Natterer <mitch@gimp.org>
* app/core/gimp-utils.[ch]
* app/core/gimp.c
* app/widgets/gimpcontrollerinfo.c
* libgimpwidgets/gimpcontroller.c: removed various boolean_handled
signal accumulators and use g_signal_accumulator_true_handled().
2007-02-16 Sven Neumann <sven@gimp.org> 2007-02-16 Sven Neumann <sven@gimp.org>
* plug-ins/common/screenshot.c: changed hint and button label. * plug-ins/common/screenshot.c: changed hint and button label.
...@@ -286,22 +286,6 @@ gimp_get_default_unit (void) ...@@ -286,22 +286,6 @@ gimp_get_default_unit (void)
return GIMP_UNIT_INCH; return GIMP_UNIT_INCH;
} }
gboolean
gimp_boolean_handled_accum (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
gboolean continue_emission;
gboolean signal_handled;
signal_handled = g_value_get_boolean (handler_return);
g_value_set_boolean (return_accu, signal_handled);
continue_emission = ! signal_handled;
return continue_emission;
}
GParameter * GParameter *
gimp_parameters_append (GType object_type, gimp_parameters_append (GType object_type,
GParameter *params, GParameter *params,
......
...@@ -33,11 +33,6 @@ gint64 gimp_g_param_spec_get_memsize (GParamSpec *pspec); ...@@ -33,11 +33,6 @@ gint64 gimp_g_param_spec_get_memsize (GParamSpec *pspec);
gchar * gimp_get_default_language (const gchar *category); gchar * gimp_get_default_language (const gchar *category);
GimpUnit gimp_get_default_unit (void); GimpUnit gimp_get_default_unit (void);
gboolean gimp_boolean_handled_accum (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
GParameter * gimp_parameters_append (GType object_type, GParameter * gimp_parameters_append (GType object_type,
GParameter *params, GParameter *params,
gint *n_params, gint *n_params,
......
...@@ -147,7 +147,7 @@ gimp_class_init (GimpClass *klass) ...@@ -147,7 +147,7 @@ gimp_class_init (GimpClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpClass, exit), G_STRUCT_OFFSET (GimpClass, exit),
gimp_boolean_handled_accum, NULL, g_signal_accumulator_true_handled, NULL,
gimp_marshal_BOOLEAN__BOOLEAN, gimp_marshal_BOOLEAN__BOOLEAN,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include "widgets-types.h" #include "widgets-types.h"
#include "core/gimp-utils.h"
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
#include "gimpcontrollerinfo.h" #include "gimpcontrollerinfo.h"
...@@ -130,7 +129,7 @@ gimp_controller_info_class_init (GimpControllerInfoClass *klass) ...@@ -130,7 +129,7 @@ gimp_controller_info_class_init (GimpControllerInfoClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpControllerInfoClass, event_mapped), G_STRUCT_OFFSET (GimpControllerInfoClass, event_mapped),
gimp_boolean_handled_accum, NULL, g_signal_accumulator_true_handled, NULL,
gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING, gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING,
G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, 3,
G_TYPE_OBJECT, G_TYPE_OBJECT,
......
...@@ -68,22 +68,6 @@ G_DEFINE_TYPE_WITH_CODE (GimpController, gimp_controller, G_TYPE_OBJECT, ...@@ -68,22 +68,6 @@ G_DEFINE_TYPE_WITH_CODE (GimpController, gimp_controller, G_TYPE_OBJECT,
static guint controller_signals[LAST_SIGNAL] = { 0 }; static guint controller_signals[LAST_SIGNAL] = { 0 };
static gboolean
gimp_controller_boolean_handled_accumulator (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy)
{
gboolean continue_emission;
gboolean signal_handled;
signal_handled = g_value_get_boolean (handler_return);
g_value_set_boolean (return_accu, signal_handled);
continue_emission = ! signal_handled;
return continue_emission;
}
static void static void
gimp_controller_class_init (GimpControllerClass *klass) gimp_controller_class_init (GimpControllerClass *klass)
{ {
...@@ -119,7 +103,7 @@ gimp_controller_class_init (GimpControllerClass *klass) ...@@ -119,7 +103,7 @@ gimp_controller_class_init (GimpControllerClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GimpControllerClass, event), G_STRUCT_OFFSET (GimpControllerClass, event),
gimp_controller_boolean_handled_accumulator, NULL, g_signal_accumulator_true_handled, NULL,
_gimp_widgets_marshal_BOOLEAN__POINTER, _gimp_widgets_marshal_BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_POINTER); G_TYPE_POINTER);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment