[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)
[platform/upstream/glib.git] / gobject / gmarshal.c
index 02a7c11..78334f1 100644 (file)
@@ -1,11 +1,14 @@
-/* Note: This file is no longer generated.  See the comment in gmarshal.list */
 
-#include "gvalue.h"
-#include "gclosure.h"
+#include "config.h"
+
+#include "gobject.h"
+#include "genums.h"
+#include "gboxed.h"
+#include "gvaluetypes.h"
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
@@ -59,9 +62,60 @@ g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                gpointer      invocation_hint G_GNUC_UNUSED,
                                gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__VOID) (gpointer     data1,
+                                           gpointer     data2);
+  GMarshalFunc_VOID__VOID callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 1);
+
+  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__VOID) (marshal_data ? marshal_data : cc->callback);
+
+  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
@@ -72,9 +126,70 @@ g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                   gpointer      invocation_hint G_GNUC_UNUSED,
                                   gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__BOOLEAN) (gpointer     data1,
+                                              gboolean     arg_1,
+                                              gpointer     data2);
+  GMarshalFunc_VOID__BOOLEAN callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -85,10 +200,71 @@ g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                gpointer      invocation_hint G_GNUC_UNUSED,
                                gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__CHAR) (gpointer     data1,
+                                           gchar        arg_1,
+                                           gpointer     data2);
+  GMarshalFunc_VOID__CHAR callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__CHAR) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
@@ -98,9 +274,70 @@ g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__UCHAR) (gpointer     data1,
+                                            guchar       arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__UCHAR callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__UCHAR) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -111,9 +348,70 @@ g_cclosure_marshal_VOID__INT (GClosure     *closure,
                               gpointer      invocation_hint G_GNUC_UNUSED,
                               gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__INT) (gpointer     data1,
+                                          gint         arg_1,
+                                          gpointer     data2);
+  GMarshalFunc_VOID__INT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -124,9 +422,70 @@ g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                gpointer      invocation_hint G_GNUC_UNUSED,
                                gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__UINT) (gpointer     data1,
+                                           guint        arg_1,
+                                           gpointer     data2);
+  GMarshalFunc_VOID__UINT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__UINT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -137,9 +496,70 @@ g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                gpointer      invocation_hint G_GNUC_UNUSED,
                                gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__LONG) (gpointer     data1,
+                                           glong        arg_1,
+                                           gpointer     data2);
+  GMarshalFunc_VOID__LONG callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__LONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -150,9 +570,70 @@ g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__ULONG) (gpointer     data1,
+                                            gulong       arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__ULONG callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__ULONG) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -163,9 +644,70 @@ g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                gpointer      invocation_hint G_GNUC_UNUSED,
                                gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__ENUM) (gpointer     data1,
+                                           gint         arg_1,
+                                           gpointer     data2);
+  GMarshalFunc_VOID__ENUM callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__ENUM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -176,10 +718,71 @@ g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__FLAGS) (gpointer     data1,
+                                            guint        arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__FLAGS callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
@@ -189,10 +792,71 @@ g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__FLOAT) (gpointer     data1,
+                                            gfloat       arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__FLOAT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__FLOAT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
@@ -202,9 +866,70 @@ g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                  gpointer      invocation_hint G_GNUC_UNUSED,
                                  gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__DOUBLE) (gpointer     data1,
+                                             gdouble      arg_1,
+                                             gpointer     data2);
+  GMarshalFunc_VOID__DOUBLE callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -215,9 +940,74 @@ g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                  gpointer      invocation_hint G_GNUC_UNUSED,
                                  gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__STRING) (gpointer     data1,
+                                             gpointer     arg_1,
+                                             gpointer     data2);
+  GMarshalFunc_VOID__STRING callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -228,10 +1018,75 @@ g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__PARAM) (gpointer     data1,
+                                            gpointer     arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__PARAM callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__PARAM) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
@@ -241,9 +1096,74 @@ g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                 gpointer      invocation_hint G_GNUC_UNUSED,
                                 gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__BOXED) (gpointer     data1,
+                                            gpointer     arg_1,
+                                            gpointer     data2);
+  GMarshalFunc_VOID__BOXED callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
@@ -254,10 +1174,71 @@ g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                   gpointer      invocation_hint G_GNUC_UNUSED,
                                   gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__POINTER) (gpointer     data1,
+                                              gpointer     arg_1,
+                                              gpointer     data2);
+  GMarshalFunc_VOID__POINTER callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
@@ -267,10 +1248,75 @@ g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                  gpointer      invocation_hint G_GNUC_UNUSED,
                                  gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__OBJECT) (gpointer     data1,
+                                             gpointer     arg_1,
+                                             gpointer     data2);
+  GMarshalFunc_VOID__OBJECT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
@@ -280,10 +1326,75 @@ g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
                                   gpointer      invocation_hint G_GNUC_UNUSED,
                                   gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__VARIANT) (gpointer     data1,
+                                              gpointer     arg_1,
+                                              gpointer     data2);
+  GMarshalFunc_VOID__VARIANT callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  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__VARIANT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            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
 g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
@@ -293,9 +1404,76 @@ g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                        gpointer      invocation_hint G_GNUC_UNUSED,
                                        gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef void (*GMarshalFunc_VOID__UINT_POINTER) (gpointer     data1,
+                                                   guint        arg_1,
+                                                   gpointer     arg_2,
+                                                   gpointer     data2);
+  GMarshalFunc_VOID__UINT_POINTER callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  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__UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_uint (param_values + 1),
+            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
@@ -306,9 +1484,79 @@ g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                    gpointer      invocation_hint G_GNUC_UNUSED,
                                    gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef gboolean (*GMarshalFunc_BOOLEAN__FLAGS) (gpointer     data1,
+                                                   guint        arg_1,
+                                                   gpointer     data2);
+  GMarshalFunc_BOOLEAN__FLAGS callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  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_BOOLEAN__FLAGS) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_flags (param_values + 1),
+                       data2);
+
+  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
@@ -319,10 +1567,90 @@ g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                            gpointer      invocation_hint G_GNUC_UNUSED,
                                            gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef gchar* (*GMarshalFunc_STRING__OBJECT_POINTER) (gpointer     data1,
+                                                         gpointer     arg_1,
+                                                         gpointer     arg_2,
+                                                         gpointer     data2);
+  GMarshalFunc_STRING__OBJECT_POINTER callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  gchar* v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  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_STRING__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_object (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  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
 g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
@@ -332,7 +1660,91 @@ g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
                                          gpointer      invocation_hint G_GNUC_UNUSED,
                                          gpointer      marshal_data)
 {
-  g_cclosure_marshal_generic (closure, return_value, n_param_values, param_values,
-                             invocation_hint, marshal_data);
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer     data1,
+                                                         gpointer     arg_1,
+                                                         gpointer     arg_2,
+                                                         gpointer     data2);
+  GMarshalFunc_BOOLEAN__BOXED_BOXED callback;
+  GCClosure *cc = (GCClosure*) closure;
+  gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  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_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       g_marshal_value_peek_boxed (param_values + 2),
+                       data2);
+
+  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);
 }
 
+