diff options
| author | David Hoover <karma@deadmoose.com> | 2004-10-26 16:25:26 +0000 |
|---|---|---|
| committer | David Hoover <dhoover@src.gnome.org> | 2004-10-26 16:25:26 +0000 |
| commit | aad5c37c14c4cdacfb380a5f7e26df2a1b8cf100 (patch) | |
| tree | b2b76caaacb693241b457129312fa40040f9099c | |
| parent | a17ce1f4028a4e48755b0cadebc7a63e73b85da2 (diff) | |
| download | glade-aad5c37c14c4cdacfb380a5f7e26df2a1b8cf100.tar.gz | |
Dynamically generate a marshaller that was in glade-editor.c, shorten the
2004-10-26 David Hoover <karma@deadmoose.com>
* src/Makefile.am,src/glade-editor.c,src/glade-marshallers.list,
src/glade-widget.c: Dynamically generate a marshaller that was in
glade-editor.c, shorten the marshallers' prefix.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/glade-editor.c | 45 | ||||
| -rw-r--r-- | src/glade-marshallers.list | 1 | ||||
| -rw-r--r-- | src/glade-widget.c | 2 |
5 files changed, 12 insertions, 46 deletions
@@ -1,3 +1,9 @@ +2004-10-26 David Hoover <karma@deadmoose.com> + + * src/Makefile.am,src/glade-editor.c,src/glade-marshallers.list, + src/glade-widget.c: Dynamically generate a marshaller that was in + glade-editor.c, shorten the marshallers' prefix. + 2004-10-25 David Hoover <karma@deadmoose.com> * configure.in, src/.cvsignore, src/Makefile.am, diff --git a/src/Makefile.am b/src/Makefile.am index 47fd7c2c..04bb00a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,10 +101,10 @@ noinst_HEADERS = \ # Marshaller generation # glade-marshallers.h: glade-marshallers.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) --prefix=glade_cclosure_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_cclosure_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \ + $(GLIB_GENMARSHAL) --prefix=glade_marshal $(srcdir)/glade-marshallers.list --body > glade-marshallers-c.tmp \ && mv glade-marshallers-c.tmp glade-marshallers.c \ || ( rm -f glade-marshallers-c.tmp && exit 1 ) diff --git a/src/glade-editor.c b/src/glade-editor.c index cf18190c..832a38bd 100644 --- a/src/glade-editor.c +++ b/src/glade-editor.c @@ -40,6 +40,7 @@ #include "glade-property-class.h" #include "glade-command.h" #include "glade-debug.h" +#include "glade-marshallers.h" #include "glade-menu-editor.h" #include "glade-project.h" #include "glade-utils.h" @@ -67,48 +68,6 @@ static gboolean glade_editor_table_append_items (GladeEditorTable *table, static void glade_editor_property_load_flags (GladeEditorProperty *property); -/* marshallers */ - -static void -glade_editor_marshal_VOID__STRING_ULONG_UINT_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_ULONG_UINT_STRING) (gpointer data1, - gpointer arg_1, - gulong arg_2, - guint arg_3, - gpointer arg_4, - gpointer data2); - GMarshalFunc_VOID__STRING_ULONG_UINT_STRING callback; - GCClosure *cc = (GCClosure*) closure; - gpointer data1, data2; - - g_return_if_fail (n_param_values == 5); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_ULONG_UINT_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - (char*) g_value_get_string (param_values + 1), - g_value_get_ulong (param_values + 2), - g_value_get_uint (param_values + 3), - (char*) g_value_get_string (param_values + 4), - data2); -} - /** * glade_editor_get_type: * @@ -155,7 +114,7 @@ glade_editor_class_init (GladeEditorClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GladeEditorClass, add_signal), NULL, NULL, - glade_editor_marshal_VOID__STRING_ULONG_UINT_STRING, + glade_marshal_VOID__STRING_ULONG_UINT_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_ULONG, G_TYPE_UINT, G_TYPE_STRING); diff --git a/src/glade-marshallers.list b/src/glade-marshallers.list index cd488530..df1de894 100644 --- a/src/glade-marshallers.list +++ b/src/glade-marshallers.list @@ -1 +1,2 @@ VOID:POINTER,POINTER +VOID:STRING,ULONG,UINT,STRING diff --git a/src/glade-widget.c b/src/glade-widget.c index 41d2b849..be8f6b46 100644 --- a/src/glade-widget.c +++ b/src/glade-widget.c @@ -198,7 +198,7 @@ glade_widget_class_init (GladeWidgetKlass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GladeWidgetKlass, change_signal_handler), NULL, NULL, - glade_cclosure_marshal_VOID__POINTER_POINTER, + glade_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); |