From: John Darrington Date: Mon, 1 Dec 2008 10:13:16 +0000 (+0900) Subject: Remove marshaller from helper.c and use a generated one instead X-Git-Tag: v0.7.1~86 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02351194a13ff724babc77e9c1da48ef0eed254f;p=pspp-builds.git Remove marshaller from helper.c and use a generated one instead --- diff --git a/lib/gtksheet/marshaller-list b/lib/gtksheet/marshaller-list index 101e4224..df5ac6ce 100644 --- a/lib/gtksheet/marshaller-list +++ b/lib/gtksheet/marshaller-list @@ -6,6 +6,7 @@ BOOLEAN:BOXED,POINTER BOOLEAN:VOID VOID:BOXED,BOXED VOID:INT,INT +VOID:INT,INT,INT VOID:INT,INT,INT,INT VOID:INT,POINTER VOID:OBJECT,OBJECT diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 1007ff96..a4ac261c 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -254,52 +254,6 @@ execute_syntax (struct getl_interface *sss) -#ifdef G_ENABLE_DEBUG -# define g_marshal_value_peek_int(v) g_value_get_int (v) -#else -# define g_marshal_value_peek_int(v) (v)->data[0].v_int -#endif - - -/* VOID:INT,INT,INT */ -void -marshaller_VOID__INT_INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1, - gint arg_1, - gint arg_2, - gint arg_3, - gpointer data2); - register GMarshalFunc_VOID__INT_INT_INT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - 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__INT_INT_INT) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - data2); -} - /* Create a deep copy of SRC */ GtkListStore * clone_list_store (const GtkListStore *src) diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index f2301842..4572ba0b 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -153,7 +153,7 @@ psppire_dict_class_init (PsppireDictClass *class) G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - marshaller_VOID__INT_INT_INT, + psppire_marshal_VOID__INT_INT_INT, G_TYPE_NONE, 3, G_TYPE_INT,