GNOME.org
 

[glade] * gladeui/Makefile.am, gladeui/glade-accumulators.[ch], gladeui/glade-app.c, gladeui/glade-base-ed

commit 015bbf1a1f7abc28b6d25dc6357c2049d99193ea
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Feb 5 18:24:30 2011 +0900

    	* gladeui/Makefile.am, gladeui/glade-accumulators.[ch], gladeui/glade-app.c,
    	gladeui/glade-base-editor.c, gladeui/glade-cell-renderer-icon.c,
    	gladeui/glade-editor-property.c, gladeui/glade-project.c, gladeui/glade-property.c,
            gladeui/glade-widget.c, plugins/gtk+/Makefile.am, plugins/gtk+/glade-fixed.c
    	Made glade-marshallers.[ch] and glade-accumulators.[ch] private to libgladeui-2.

 ChangeLog                          |    6 +++++
 gladeui/Makefile.am                |   12 +++++-----
 gladeui/glade-accumulators.c       |   34 +++++++++++++++---------------
 gladeui/glade-accumulators.h       |   40 ++++++++++++++++++------------------
 gladeui/glade-app.c                |    4 +-
 gladeui/glade-base-editor.c        |   22 +++++++++---------
 gladeui/glade-cell-renderer-icon.c |    2 +-
 gladeui/glade-editor-property.c    |    2 +-
 gladeui/glade-project.c            |    6 ++--
 gladeui/glade-property.c           |    4 +-
 gladeui/glade-widget.c             |   14 ++++++------
 plugins/gtk+/Makefile.am           |   18 ++++++++++++++-
 plugins/gtk+/glade-fixed.c         |   31 +++++++++++++++++++++------
 13 files changed, 116 insertions(+), 79 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f052791..b90614a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 	* gladeui/glade-widget.c: Make glade_widget_rebuild() use glade_widget_add/remove
 	  instead of glade_widget_replace().
 
+	* gladeui/Makefile.am, gladeui/glade-accumulators.[ch], gladeui/glade-app.c,
+	gladeui/glade-base-editor.c, gladeui/glade-cell-renderer-icon.c,
+	gladeui/glade-editor-property.c, gladeui/glade-project.c, gladeui/glade-property.c,
+        gladeui/glade-widget.c, plugins/gtk+/Makefile.am, plugins/gtk+/glade-fixed.c
+	Made glade-marshallers.[ch] and glade-accumulators.[ch] private to libgladeui-2.
+
 2011-02-04  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-project.c:
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 0094c3a..eae7301 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -83,9 +83,6 @@ libgladeui_2_la_SOURCES = \
 	glade-builtins.c \
 	glade-app.c \
 	glade-clipboard.c \
-	glade-popup.h \
-	glade-marshallers.h \
-	glade-accumulators.h \
 	glade-name-context.c \
 	glade-displayable-values.c \
 	glade-signal-model.c \
@@ -133,7 +130,6 @@ libgladeuiinclude_HEADERS = \
 	glade-xml-utils.h \
 	glade-signal.h \
 	glade-signal-class.h \
-	glade-cursor.h \
 	glade-catalog.h \
 	glade-widget-action.h \
 	glade-name-context.h \
@@ -144,7 +140,11 @@ libgladeuiinclude_HEADERS = \
 	glade-signal-model.h
 
 noinst_HEADERS = \
+	glade-marshallers.h \
 	glade-design-layout.h \
+	glade-popup.h \
+	glade-cursor.h \
+	glade-accumulators.h \
 	glade-design-private.h
 
 if PLATFORM_WIN32
@@ -182,11 +182,11 @@ gladeui.def: $(libgladeuiinclude_HEADERS)
 # Marshaller generation
 #
 glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \
+	$(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --header > glade-marshallers-h.tmp \
 	&& mv glade-marshallers-h.tmp glade-marshallers.h \
 	|| ( rm -f glade-marshallers-h.tmp && exit 1)
 glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body --header > glade-marshallers-c.tmp     \
+	$(GLIB_GENMARSHAL) --prefix=_glade_marshal $(srcdir)/glade-marshallers.list --body --header > glade-marshallers-c.tmp     \
 	&& mv glade-marshallers-c.tmp glade-marshallers.c \
 	|| ( rm -f glade-marshallers-c.tmp && exit 1 )
 
diff --git a/gladeui/glade-accumulators.c b/gladeui/glade-accumulators.c
index aa3574c..41d4886 100644
--- a/gladeui/glade-accumulators.c
+++ b/gladeui/glade-accumulators.c
@@ -30,9 +30,9 @@
 
 
 gboolean
-glade_single_object_accumulator (GSignalInvocationHint * ihint,
-                                 GValue * return_accu,
-                                 const GValue * handler_return, gpointer dummy)
+_glade_single_object_accumulator (GSignalInvocationHint * ihint,
+				  GValue * return_accu,
+				  const GValue * handler_return, gpointer dummy)
 {
   GObject *object = g_value_get_object (handler_return);
   g_value_set_object (return_accu, object);
@@ -41,10 +41,10 @@ glade_single_object_accumulator (GSignalInvocationHint * ihint,
 }
 
 gboolean
-glade_integer_handled_accumulator (GSignalInvocationHint * ihint,
-                                   GValue * return_accu,
-                                   const GValue * handler_return,
-                                   gpointer dummy)
+_glade_integer_handled_accumulator (GSignalInvocationHint * ihint,
+				    GValue * return_accu,
+				    const GValue * handler_return,
+				    gpointer dummy)
 {
   gboolean continue_emission;
   gint retval;
@@ -58,10 +58,10 @@ glade_integer_handled_accumulator (GSignalInvocationHint * ihint,
 
 /* From gtkmain.c */
 gboolean
-glade_boolean_handled_accumulator (GSignalInvocationHint * ihint,
-                                   GValue * return_accu,
-                                   const GValue * handler_return,
-                                   gpointer dummy)
+_glade_boolean_handled_accumulator (GSignalInvocationHint * ihint,
+				    GValue * return_accu,
+				    const GValue * handler_return,
+				    gpointer dummy)
 {
   gboolean continue_emission;
   gboolean signal_handled;
@@ -74,9 +74,9 @@ glade_boolean_handled_accumulator (GSignalInvocationHint * ihint,
 }
 
 gboolean
-glade_string_accumulator (GSignalInvocationHint * ihint,
-                          GValue * return_accu,
-                          const GValue * handler_return, gpointer dummy)
+_glade_string_accumulator (GSignalInvocationHint * ihint,
+			   GValue * return_accu,
+			   const GValue * handler_return, gpointer dummy)
 {
   const gchar *handler_str;
 
@@ -89,9 +89,9 @@ glade_string_accumulator (GSignalInvocationHint * ihint,
 }
 
 gboolean
-glade_stop_emission_accumulator (GSignalInvocationHint * ihint,
-                                 GValue * return_accu,
-                                 const GValue * handler_return, gpointer dummy)
+_glade_stop_emission_accumulator (GSignalInvocationHint * ihint,
+				  GValue * return_accu,
+				  const GValue * handler_return, gpointer dummy)
 {
   g_value_copy (handler_return, return_accu);
 
diff --git a/gladeui/glade-accumulators.h b/gladeui/glade-accumulators.h
index e951475..455b040 100644
--- a/gladeui/glade-accumulators.h
+++ b/gladeui/glade-accumulators.h
@@ -5,30 +5,30 @@
 
 G_BEGIN_DECLS
 
-gboolean glade_single_object_accumulator   (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
+gboolean _glade_single_object_accumulator   (GSignalInvocationHint *ihint,
+					     GValue                *return_accu,
+					     const GValue          *handler_return,
+					     gpointer               dummy);
 
-gboolean glade_integer_handled_accumulator (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
+gboolean _glade_integer_handled_accumulator (GSignalInvocationHint *ihint,
+					     GValue                *return_accu,
+					     const GValue          *handler_return,
+					     gpointer               dummy);
 					    
-gboolean glade_boolean_handled_accumulator (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
+gboolean _glade_boolean_handled_accumulator (GSignalInvocationHint *ihint,
+					     GValue                *return_accu,
+					     const GValue          *handler_return,
+					     gpointer               dummy);
 
-gboolean glade_string_accumulator          (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
+gboolean _glade_string_accumulator          (GSignalInvocationHint *ihint,
+					     GValue                *return_accu,
+					     const GValue          *handler_return,
+					     gpointer               dummy);
 
-gboolean glade_stop_emission_accumulator   (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
+gboolean _glade_stop_emission_accumulator   (GSignalInvocationHint *ihint,
+					     GValue                *return_accu,
+					     const GValue          *handler_return,
+					     gpointer               dummy);
 G_END_DECLS
 
 #endif   /* __GLADE_ACCUMULATORS_H__ */
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index 6683024..c7ca694 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -336,7 +336,7 @@ glade_app_class_init (GladeAppClass * klass)
       g_signal_new ("doc-search",
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                    glade_marshal_VOID__STRING_STRING_STRING,
+                    _glade_marshal_VOID__STRING_STRING_STRING,
                     G_TYPE_NONE, 3,
                     G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -355,7 +355,7 @@ glade_app_class_init (GladeAppClass * klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  glade_marshal_VOID__OBJECT,
+                  _glade_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1, G_TYPE_OBJECT);  
 
   g_type_class_add_private (klass, sizeof (GladeAppPrivate));
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index bdbb3fb..af4d767 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -1498,7 +1498,7 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, child_selected),
                     NULL, NULL,
-                    glade_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT);
+                    _glade_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT);
 
   /**
    * GladeBaseEditor::child-change-type:
@@ -1513,8 +1513,8 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, change_type),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT_UINT,
+                    _glade_boolean_handled_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__OBJECT_UINT,
                     G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_UINT);
 
   /**
@@ -1530,8 +1530,8 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, get_display_name),
-                    glade_string_accumulator, NULL,
-                    glade_marshal_STRING__OBJECT,
+                    _glade_string_accumulator, NULL,
+                    _glade_marshal_STRING__OBJECT,
                     G_TYPE_STRING, 1, G_TYPE_OBJECT);
 
   /**
@@ -1550,8 +1550,8 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, build_child),
-                    glade_stop_emission_accumulator, NULL,
-                    glade_marshal_OBJECT__OBJECT_UINT,
+                    _glade_stop_emission_accumulator, NULL,
+                    _glade_marshal_OBJECT__OBJECT_UINT,
                     G_TYPE_OBJECT, 2, G_TYPE_OBJECT, G_TYPE_UINT);
 
   /**
@@ -1565,8 +1565,8 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, delete_child),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT_OBJECT,
+                    _glade_boolean_handled_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__OBJECT_OBJECT,
                     G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_OBJECT);
 
   /**
@@ -1584,8 +1584,8 @@ glade_base_editor_class_init (GladeBaseEditorClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeBaseEditorClass, move_child),
-                    glade_stop_emission_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT_OBJECT,
+                    _glade_stop_emission_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__OBJECT_OBJECT,
                     G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_OBJECT);
 }
 
diff --git a/gladeui/glade-cell-renderer-icon.c b/gladeui/glade-cell-renderer-icon.c
index 287d682..6994745 100644
--- a/gladeui/glade-cell-renderer-icon.c
+++ b/gladeui/glade-cell-renderer-icon.c
@@ -114,7 +114,7 @@ glade_cell_renderer_icon_class_init (GladeCellRendererIconClass * class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeCellRendererIconClass, activate),
                     NULL, NULL,
-                    glade_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+                    _glade_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 
   g_type_class_add_private (class, sizeof (GladeCellRendererIconPrivate));
 }
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 7402c99..c041e4c 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -619,7 +619,7 @@ glade_editor_property_class_init (GladeEditorPropertyClass * eprop_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeEditorPropertyClass, commit),
                     NULL, NULL,
-                    glade_marshal_VOID__POINTER,
+                    _glade_marshal_VOID__POINTER,
                     G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   /* Properties */
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 671e14e..4ce0893 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -905,7 +905,7 @@ glade_project_class_init (GladeProjectClass * klass)
                     G_SIGNAL_RUN_FIRST,
                     G_STRUCT_OFFSET (GladeProjectClass, changed),
                     NULL, NULL,
-                    glade_marshal_VOID__OBJECT_BOOLEAN,
+                    _glade_marshal_VOID__OBJECT_BOOLEAN,
                     G_TYPE_NONE, 2, GLADE_TYPE_COMMAND, G_TYPE_BOOLEAN);
 
   /**
@@ -960,7 +960,7 @@ glade_project_class_init (GladeProjectClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_FIRST,
                     0, NULL, NULL,
-                    glade_marshal_VOID__INT_INT,
+                    _glade_marshal_VOID__INT_INT,
                     G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
   /**
@@ -976,7 +976,7 @@ glade_project_class_init (GladeProjectClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_FIRST,
                     0, NULL, NULL,
-                    glade_marshal_VOID__OBJECT_BOOLEAN,
+                    _glade_marshal_VOID__OBJECT_BOOLEAN,
                     G_TYPE_NONE, 2, GLADE_TYPE_WIDGET, G_TYPE_BOOLEAN);
     
   g_object_class_install_property (object_class,
diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c
index 672fb0d..25ecb2c 100644
--- a/gladeui/glade-property.c
+++ b/gladeui/glade-property.c
@@ -674,7 +674,7 @@ glade_property_klass_init (GladePropertyKlass * prop_class)
                     G_STRUCT_OFFSET (GladePropertyKlass,
                                      value_changed),
                     NULL, NULL,
-                    glade_marshal_VOID__POINTER_POINTER,
+                    _glade_marshal_VOID__POINTER_POINTER,
                     G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
   glade_property_signals[TOOLTIP_CHANGED] =
@@ -684,7 +684,7 @@ glade_property_klass_init (GladePropertyKlass * prop_class)
                     G_STRUCT_OFFSET (GladePropertyKlass,
                                      tooltip_changed),
                     NULL, NULL,
-                    glade_marshal_VOID__STRING_STRING_STRING,
+                    _glade_marshal_VOID__STRING_STRING_STRING,
                     G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING,
                     G_TYPE_STRING);
 
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 923ab70..2815311 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -1352,7 +1352,7 @@ glade_widget_class_init (GladeWidgetClass * klass)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeWidgetClass, change_signal_handler),
                      NULL, NULL,
-                    glade_marshal_VOID__OBJECT,
+                    _glade_marshal_VOID__OBJECT,
                     G_TYPE_NONE, 1, GLADE_TYPE_SIGNAL);
 
   /**
@@ -1365,8 +1365,8 @@ glade_widget_class_init (GladeWidgetClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeWidgetClass, button_press_event),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__BOXED,
+                    _glade_boolean_handled_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__BOXED,
                     G_TYPE_BOOLEAN, 1,
                     GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
@@ -1380,8 +1380,8 @@ glade_widget_class_init (GladeWidgetClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeWidgetClass, button_release_event),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__BOXED,
+                    _glade_boolean_handled_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__BOXED,
                     G_TYPE_BOOLEAN, 1,
                     GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
@@ -1396,8 +1396,8 @@ glade_widget_class_init (GladeWidgetClass * klass)
                     G_TYPE_FROM_CLASS (object_class),
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GladeWidgetClass, motion_notify_event),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__BOXED,
+                    _glade_boolean_handled_accumulator, NULL,
+                    _glade_marshal_BOOLEAN__BOXED,
                     G_TYPE_BOOLEAN, 1,
                     GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am
index f11eb89..ee7453c 100644
--- a/plugins/gtk+/Makefile.am
+++ b/plugins/gtk+/Makefile.am
@@ -25,7 +25,7 @@ libgladegtk_la_SOURCES     = glade-gtk.c glade-fixed.c glade-accels.c glade-attr
 	glade-icon-sources.c glade-button-editor.c glade-tool-button-editor.c glade-image-editor.c \
 	glade-image-item-editor.c glade-icon-factory-editor.c glade-store-editor.c glade-label-editor.c \
 	glade-cell-renderer-editor.c glade-treeview-editor.c glade-entry-editor.c glade-activatable-editor.c \
-	glade-tool-item-group-editor.c glade-string-list.c
+	glade-tool-item-group-editor.c glade-string-list.c glade-gtk-marshallers.c
 
 libgladegtk_la_LDFLAGS     = -module -avoid-version $(AM_LDFLAGS)
 libgladegtk_la_LIBADD      = $(libgladeui) $(GTK_LIBS)
@@ -35,7 +35,7 @@ noinst_HEADERS = glade-gtk.h glade-accels.h glade-attributes.h glade-column-type
 	glade-tool-button-editor.h glade-image-editor.h glade-image-item-editor.h glade-icon-factory-editor.h \
 	glade-store-editor.h glade-label-editor.h glade-cell-renderer-editor.h glade-treeview-editor.h \
 	glade-entry-editor.h glade-activatable-editor.h glade-fixed.h glade-tool-item-group-editor.h \
-	glade-string-list.h
+	glade-string-list.h glade-gtk-marshallers.h
 
 
 if PLATFORM_WIN32
@@ -58,4 +58,18 @@ endif
 
 CLEANFILES = gtk+.xml gtkunixprint.xml
 
+BUILT_SOURCES = glade-gtk-marshallers.c glade-gtk-marshallers.h
+
 EXTRA_DIST = gtk+.xml gtk+.xml.in gtkunixprint.xml gtkunixprint.xml.in
+
+#
+# Marshaller generation
+#
+glade-gtk-marshallers.h: glade-gtk-marshallers.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --header > glade-gtk-marshallers-h.tmp \
+	&& mv glade-gtk-marshallers-h.tmp glade-gtk-marshallers.h \
+	|| ( rm -f glade-gtk-marshallers-h.tmp && exit 1)
+glade-gtk-marshallers.c: glade-gtk-marshallers.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) --prefix=glade_gtk_marshal $(srcdir)/glade-gtk-marshallers.list --body --header > glade-gtk-marshallers-c.tmp     \
+	&& mv glade-gtk-marshallers-c.tmp glade-gtk-marshallers.c \
+	|| ( rm -f glade-gtk-marshallers-c.tmp && exit 1 )
diff --git a/plugins/gtk+/glade-fixed.c b/plugins/gtk+/glade-fixed.c
index 140417e..7be6958 100644
--- a/plugins/gtk+/glade-fixed.c
+++ b/plugins/gtk+/glade-fixed.c
@@ -53,9 +53,9 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <gladeui/glade.h>
-#include <gladeui/glade-accumulators.h>
 #include <gladeui/glade-marshallers.h>
 #include <gladeui/glade-popup.h>
+#include "glade-gtk-marshallers.h"
 #include "glade-fixed.h"
 
 /* properties */
@@ -96,6 +96,23 @@ typedef struct
 static GObjectClass *parent_class;
 static guint glade_fixed_signals[FIXED_SIGNALS];
 
+/* From gtkmain.c */
+static gboolean
+glade_fixed_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 helper routines
  *******************************************************************************/
@@ -1040,8 +1057,8 @@ glade_fixed_class_init (GladeFixedClass * fixed_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET
                     (GladeFixedClass, configure_child),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT_POINTER,
+                    glade_fixed_boolean_handled_accumulator, NULL,
+                    glade_gtk_marshal_BOOLEAN__OBJECT_POINTER,
                     G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, G_TYPE_POINTER);
 
         /**
@@ -1060,8 +1077,8 @@ glade_fixed_class_init (GladeFixedClass * fixed_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET
                     (GladeFixedClass, configure_begin),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT,
+                    glade_fixed_boolean_handled_accumulator, NULL,
+                    glade_gtk_marshal_BOOLEAN__OBJECT,
                     G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT);
 
         /**
@@ -1080,8 +1097,8 @@ glade_fixed_class_init (GladeFixedClass * fixed_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET
                     (GladeFixedClass, configure_end),
-                    glade_boolean_handled_accumulator, NULL,
-                    glade_marshal_BOOLEAN__OBJECT,
+                    glade_fixed_boolean_handled_accumulator, NULL,
+                    glade_gtk_marshal_BOOLEAN__OBJECT,
                     G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]