tests: Fix for non-GCC
[platform/upstream/glib.git] / gobject / gmarshal.c
index c7bcce4..883ab72 100644 (file)
@@ -85,6 +85,37 @@ g_cclosure_marshal_VOID__VOID (GClosure     *closure,
   callback (data1,
             data2);
 }
+void
+g_cclosure_marshal_VOID__VOIDv (GClosure     *closure,
+                                GValue       *return_value,
+                                gpointer      instance,
+                                va_list       args,
+                                gpointer      marshal_data,
+                                int           n_params,
+                                GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__VOID) (gpointer     instance,
+                                           gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__VOID callback;
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__VOID) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            data2);
+}
+
 
 /* VOID:BOOLEAN (./gmarshal.list:7) */
 void
@@ -120,6 +151,45 @@ g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
             g_marshal_value_peek_boolean (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__BOOLEANv (GClosure     *closure,
+                                   GValue       *return_value,
+                                   gpointer      instance,
+                                   va_list       args,
+                                   gpointer      marshal_data,
+                                   int           n_params,
+                                   GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__BOOLEAN) (gpointer     instance,
+                                              gboolean     arg_0,
+                                              gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__BOOLEAN callback;
+  gboolean arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gboolean) va_arg (args_copy, gboolean);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:CHAR (./gmarshal.list:8) */
 void
@@ -155,6 +225,45 @@ g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
             g_marshal_value_peek_char (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__CHARv (GClosure     *closure,
+                                GValue       *return_value,
+                                gpointer      instance,
+                                va_list       args,
+                                gpointer      marshal_data,
+                                int           n_params,
+                                GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__CHAR) (gpointer     instance,
+                                           gchar        arg_0,
+                                           gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__CHAR callback;
+  gchar arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gchar) va_arg (args_copy, gint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__CHAR) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:UCHAR (./gmarshal.list:9) */
 void
@@ -190,6 +299,45 @@ g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
             g_marshal_value_peek_uchar (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__UCHARv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__UCHAR) (gpointer     instance,
+                                            guchar       arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__UCHAR callback;
+  guchar arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (guchar) va_arg (args_copy, guint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__UCHAR) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:INT (./gmarshal.list:10) */
 void
@@ -225,6 +373,45 @@ g_cclosure_marshal_VOID__INT (GClosure     *closure,
             g_marshal_value_peek_int (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__INTv (GClosure     *closure,
+                               GValue       *return_value,
+                               gpointer      instance,
+                               va_list       args,
+                               gpointer      marshal_data,
+                               int           n_params,
+                               GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__INT) (gpointer     instance,
+                                          gint         arg_0,
+                                          gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT callback;
+  gint arg0;
+  va_list args_copy;
+
+ G_VA_COPY (args_copy, args);
+  arg0 = (gint) va_arg (args_copy, gint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:UINT (./gmarshal.list:11) */
 void
@@ -260,6 +447,45 @@ g_cclosure_marshal_VOID__UINT (GClosure     *closure,
             g_marshal_value_peek_uint (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__UINTv (GClosure     *closure,
+                                GValue       *return_value,
+                                gpointer      instance,
+                                va_list       args,
+                                gpointer      marshal_data,
+                                int           n_params,
+                                GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__UINT) (gpointer     instance,
+                                           guint        arg_0,
+                                           gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__UINT callback;
+  guint arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (guint) va_arg (args_copy, guint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__UINT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:LONG (./gmarshal.list:12) */
 void
@@ -295,6 +521,45 @@ g_cclosure_marshal_VOID__LONG (GClosure     *closure,
             g_marshal_value_peek_long (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__LONGv (GClosure     *closure,
+                                GValue       *return_value,
+                                gpointer      instance,
+                                va_list       args,
+                                gpointer      marshal_data,
+                                int           n_params,
+                                GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__LONG) (gpointer     instance,
+                                           glong        arg_0,
+                                           gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__LONG callback;
+  glong arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (glong) va_arg (args_copy, glong);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:ULONG (./gmarshal.list:13) */
 void
@@ -330,6 +595,45 @@ g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
             g_marshal_value_peek_ulong (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__ULONGv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__ULONG) (gpointer     instance,
+                                            gulong       arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ULONG callback;
+  gulong arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gulong) va_arg (args_copy, gulong);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ULONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:ENUM (./gmarshal.list:14) */
 void
@@ -365,6 +669,45 @@ g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
             g_marshal_value_peek_enum (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__ENUMv (GClosure     *closure,
+                                GValue       *return_value,
+                                gpointer      instance,
+                                va_list       args,
+                                gpointer      marshal_data,
+                                int           n_params,
+                                GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__ENUM) (gpointer     instance,
+                                           gint         arg_0,
+                                           gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__ENUM callback;
+  gint arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gint) va_arg (args_copy, gint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__ENUM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:FLAGS (./gmarshal.list:15) */
 void
@@ -400,6 +743,45 @@ g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
             g_marshal_value_peek_flags (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__FLAGSv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__FLAGS) (gpointer     instance,
+                                            guint        arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__FLAGS callback;
+  guint arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (guint) va_arg (args_copy, guint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:FLOAT (./gmarshal.list:16) */
 void
@@ -435,6 +817,45 @@ g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
             g_marshal_value_peek_float (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__FLOATv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__FLOAT) (gpointer     instance,
+                                            gfloat       arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__FLOAT callback;
+  gfloat arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gfloat) va_arg (args_copy, gdouble);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__FLOAT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:DOUBLE (./gmarshal.list:17) */
 void
@@ -470,6 +891,45 @@ g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
             g_marshal_value_peek_double (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__DOUBLEv (GClosure     *closure,
+                                  GValue       *return_value,
+                                  gpointer      instance,
+                                  va_list       args,
+                                  gpointer      marshal_data,
+                                  int           n_params,
+                                  GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__DOUBLE) (gpointer     instance,
+                                             gdouble      arg_0,
+                                             gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__DOUBLE callback;
+  gdouble arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gdouble) va_arg (args_copy, gdouble);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:STRING (./gmarshal.list:18) */
 void
@@ -505,6 +965,49 @@ g_cclosure_marshal_VOID__STRING (GClosure     *closure,
             g_marshal_value_peek_string (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__STRINGv (GClosure     *closure,
+                                  GValue       *return_value,
+                                  gpointer      instance,
+                                  va_list       args,
+                                  gpointer      marshal_data,
+                                  int           n_params,
+                                  GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__STRING) (gpointer     instance,
+                                             gpointer     arg_0,
+                                             gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__STRING callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    arg0 = g_strdup (arg0);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__STRING) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    g_free (arg0);
+}
+
 
 /* VOID:PARAM (./gmarshal.list:19) */
 void
@@ -540,6 +1043,49 @@ g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
             g_marshal_value_peek_param (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__PARAMv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__PARAM) (gpointer     instance,
+                                            gpointer     arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__PARAM callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    arg0 = g_param_spec_ref (arg0);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__PARAM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    g_param_spec_unref (arg0);
+}
+
 
 /* VOID:BOXED (./gmarshal.list:20) */
 void
@@ -575,6 +1121,49 @@ g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
             g_marshal_value_peek_boxed (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__BOXEDv (GClosure     *closure,
+                                 GValue       *return_value,
+                                 gpointer      instance,
+                                 va_list       args,
+                                 gpointer      marshal_data,
+                                 int           n_params,
+                                 GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__BOXED) (gpointer     instance,
+                                            gpointer     arg_0,
+                                            gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__BOXED callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    g_boxed_free (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
+}
+
 
 /* VOID:POINTER (./gmarshal.list:21) */
 void
@@ -610,6 +1199,45 @@ g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
             g_marshal_value_peek_pointer (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__POINTERv (GClosure     *closure,
+                                   GValue       *return_value,
+                                   gpointer      instance,
+                                   va_list       args,
+                                   gpointer      marshal_data,
+                                   int           n_params,
+                                   GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__POINTER) (gpointer     instance,
+                                              gpointer     arg_0,
+                                              gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__POINTER callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+}
+
 
 /* VOID:OBJECT (./gmarshal.list:22) */
 void
@@ -645,6 +1273,49 @@ g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
             g_marshal_value_peek_object (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__OBJECTv (GClosure     *closure,
+                                  GValue       *return_value,
+                                  gpointer      instance,
+                                  va_list       args,
+                                  gpointer      marshal_data,
+                                  int           n_params,
+                                  GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT) (gpointer     instance,
+                                             gpointer     arg_0,
+                                             gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__OBJECT callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if (arg0 != NULL)
+    arg0 = g_object_ref (arg0);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+  if (arg0 != NULL)
+    g_object_unref (arg0);
+}
+
 
 /* VOID:VARIANT (./gmarshal.list:23) */
 void
@@ -680,6 +1351,49 @@ g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
             g_marshal_value_peek_variant (param_values + 1),
             data2);
 }
+void
+g_cclosure_marshal_VOID__VARIANTv (GClosure     *closure,
+                                   GValue       *return_value,
+                                   gpointer      instance,
+                                   va_list       args,
+                                   gpointer      marshal_data,
+                                   int           n_params,
+                                   GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__VARIANT) (gpointer     instance,
+                                              gpointer     arg_0,
+                                              gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__VARIANT callback;
+  gpointer arg0;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    arg0 = g_variant_ref_sink (arg0);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__VARIANT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            data2);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    g_variant_unref (arg0);
+}
+
 
 /* VOID:UINT,POINTER (./gmarshal.list:26) */
 void
@@ -717,6 +1431,49 @@ g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
             g_marshal_value_peek_pointer (param_values + 2),
             data2);
 }
+void
+g_cclosure_marshal_VOID__UINT_POINTERv (GClosure     *closure,
+                                        GValue       *return_value,
+                                        gpointer      instance,
+                                        va_list       args,
+                                        gpointer      marshal_data,
+                                        int           n_params,
+                                        GType        *param_types)
+{
+  typedef void (*GMarshalFunc_VOID__UINT_POINTER) (gpointer     instance,
+                                                   guint        arg_0,
+                                                   gpointer     arg_1,
+                                                   gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__UINT_POINTER callback;
+  guint arg0;
+  gpointer arg1;
+  va_list args_copy;
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (guint) va_arg (args_copy, guint);
+  arg1 = (gpointer) va_arg (args_copy, gpointer);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            arg0,
+            arg1,
+            data2);
+}
+
 
 /* BOOL:FLAGS (./gmarshal.list:27) */
 void
@@ -756,6 +1513,50 @@ g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
 
   g_value_set_boolean (return_value, v_return);
 }
+void
+g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure     *closure,
+                                    GValue       *return_value,
+                                    gpointer      instance,
+                                    va_list       args,
+                                    gpointer      marshal_data,
+                                    int           n_params,
+                                    GType        *param_types)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__FLAGS) (gpointer     instance,
+                                                   guint        arg_0,
+                                                   gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__FLAGS callback;
+  guint arg0;
+  va_list args_copy;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (guint) va_arg (args_copy, guint);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       arg0,
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
 
 /* STRING:OBJECT,POINTER (./gmarshal.list:28) */
 void
@@ -797,6 +1598,58 @@ g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
 
   g_value_take_string (return_value, v_return);
 }
+void
+g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure     *closure,
+                                            GValue       *return_value,
+                                            gpointer      instance,
+                                            va_list       args,
+                                            gpointer      marshal_data,
+                                            int           n_params,
+                                            GType        *param_types)
+{
+  typedef gchar* (*GMarshalFunc_STRING__OBJECT_POINTER) (gpointer     instance,
+                                                         gpointer     arg_0,
+                                                         gpointer     arg_1,
+                                                         gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_STRING__OBJECT_POINTER callback;
+  gpointer arg0;
+  gpointer arg1;
+  va_list args_copy;
+  gchar* v_return;
+
+  g_return_if_fail (return_value != NULL);
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if (arg0 != NULL)
+    arg0 = g_object_ref (arg0);
+  arg1 = (gpointer) va_arg (args_copy, gpointer);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_STRING__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       arg0,
+                       arg1,
+                       data2);
+  if (arg0 != NULL)
+    g_object_unref (arg0);
+
+  g_value_take_string (return_value, v_return);
+}
+
 
 /* BOOL:BOXED,BOXED (./gmarshal.list:29) */
 void
@@ -838,4 +1691,60 @@ g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
 
   g_value_set_boolean (return_value, v_return);
 }
+void
+g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure     *closure,
+                                          GValue       *return_value,
+                                          gpointer      instance,
+                                          va_list       args,
+                                          gpointer      marshal_data,
+                                          int           n_params,
+                                          GType        *param_types)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer     instance,
+                                                         gpointer     arg_0,
+                                                         gpointer     arg_1,
+                                                         gpointer     data);
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  GMarshalFunc_BOOLEAN__BOXED_BOXED callback;
+  gpointer arg0;
+  gpointer arg1;
+  va_list args_copy;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+
+  G_VA_COPY (args_copy, args);
+  arg0 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    arg0 = g_boxed_copy (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
+  arg1 = (gpointer) va_arg (args_copy, gpointer);
+  if ((param_types[1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg1 != NULL)
+    arg1 = g_boxed_copy (param_types[1] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg1);
+  va_end (args_copy);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = instance;
+    }
+  else
+    {
+      data1 = instance;
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       arg0,
+                       arg1,
+                       data2);
+  if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL)
+    g_boxed_free (param_types[0] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
+  if ((param_types[1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg1 != NULL)
+    g_boxed_free (param_types[1] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg1);
+
+  g_value_set_boolean (return_value, v_return);
+}
+