dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added gimp_boolean_handled_accum(). 

2004-06-17  Michael Natterer  <mitch@gimp.org>

	* app/core/gimp-utils.[ch]: added gimp_boolean_handled_accum().

	* app/core/gimp.c
	* app/widgets/gimpcontrollerinfo.c: use it.
This commit is contained in:
Michael Natterer 2004-06-17 16:32:30 +00:00 committed by Michael Natterer
parent 75e6fc560b
commit 2a69c419f1
5 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-06-17 Michael Natterer <mitch@gimp.org>
* app/core/gimp-utils.[ch]: added gimp_boolean_handled_accum().
* app/core/gimp.c
* app/widgets/gimpcontrollerinfo.c: use it.
2004-06-17 Michael Natterer <mitch@gimp.org> 2004-06-17 Michael Natterer <mitch@gimp.org>
* app/core/gimpcontainer.c (gimp_container_deserialize): add newly * app/core/gimpcontainer.c (gimp_container_deserialize): add newly

16
app/core/gimp-utils.c
View File

@ -154,3 +154,19 @@ gimp_get_default_language (const gchar *category)
return lang; return lang;
} }
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;
}

5
app/core/gimp-utils.h
View File

@ -42,5 +42,10 @@ gint64 gimp_g_list_get_memsize (GList *list,
gchar * gimp_get_default_language (const gchar *category); gchar * gimp_get_default_language (const gchar *category);
gboolean gimp_boolean_handled_accum (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
#endif /* __APP_GIMP_UTILS_H__ */ #endif /* __APP_GIMP_UTILS_H__ */

25
app/core/gimp.c
View File

@ -138,30 +138,11 @@ gimp_get_type (void)
return object_type; return object_type;
} }
gboolean
gimp_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_class_init (GimpClass *klass) gimp_class_init (GimpClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpObjectClass *gimp_object_class; GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
object_class = G_OBJECT_CLASS (klass);
gimp_object_class = GIMP_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
@ -190,7 +171,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_accumulator, NULL, gimp_boolean_handled_accum, NULL,
gimp_marshal_BOOLEAN__BOOLEAN, gimp_marshal_BOOLEAN__BOOLEAN,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_BOOLEAN); G_TYPE_BOOLEAN);

19
app/widgets/gimpcontrollerinfo.c
View File

@ -36,6 +36,7 @@
#include "config/gimpconfigwriter.h" #include "config/gimpconfigwriter.h"
#include "config/gimpscanner.h" #include "config/gimpscanner.h"
#include "core/gimp-utils.h"
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
#include "gimpcontrollerinfo.h" #include "gimpcontrollerinfo.h"
@ -132,22 +133,6 @@ gimp_controller_info_get_type (void)
return controller_type; return controller_type;
} }
gboolean
gimp_controller_info_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_info_class_init (GimpControllerInfoClass *klass) gimp_controller_info_class_init (GimpControllerInfoClass *klass)
{ {
@ -176,7 +161,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_controller_info_boolean_handled_accumulator, NULL, gimp_boolean_handled_accum, 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,