gtk2 3.2.1-x64-mingw32 → 3.2.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e19eabfeb0371f3d6769aa7f4f933552654bfb6
-  data.tar.gz: 889de9537f5114dde2f9c3366e382ccc7d499a56
+SHA256:
+  metadata.gz: bf254031a47ec0a898fef25ce4beeb90bd33132ef115e2c62dbd38da92f4d698
+  data.tar.gz: c8430aa36463d3dca541de028843e8d2e2e2cfcb5dd315307c97f1d468503461
 SHA512:
-  metadata.gz: 0c32b4eed440593733cb39523763552944c92f5dbfdd5f66ca8a3e34f8c67d8ccce2b1f56db9608aeb0d0dabe445564450ae469e0f7a6bd97ed92485e2f12627
-  data.tar.gz: a1674b5585deed2849d85a09e7551ec98453cec19ce628cfb828255d36b8f36bb83dc3a114000032af49ec0d6470f1bc18e0d577b5829fe3f378c9c8a3c2c07b
+  metadata.gz: 8b21398a435a7ed29ba79333fce1e01db420ccb2f1127c199d044861b638ef74cfed24f8e1a462078cc7852e1def478718e519cb3619322800b72c74fe6fcbce
+  data.tar.gz: a4ffa26a637fc67f63da79de13337a281f7034b295affa5c90d140f614116f01e31cecd07ca283dc5512fbbcaa019dfaf871cb7037facfd758db99d1be2db8ab

data/ext/gtk2/extconf.rb

@@ -33,7 +33,12 @@ end
 
 have_func("rb_errinfo")
 
-["glib2", "pango"].each do |package|
+[
+  "glib2",
+  "atk",
+  "pango",
+  "gdk_pixbuf2",
+].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",

data/ext/gtk2/rbgtkrecentchooser.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
  *  Copyright (C) 2006  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -47,7 +47,7 @@ static VALUE
 invoke_callback(VALUE data)
 {
     struct callback_arg *arg = (struct callback_arg *)data;
-    return rb_funcall(arg->callback, id_call, 1, arg->a, arg->b);
+    return rb_funcall(arg->callback, id_call, 2, arg->a, arg->b);
 }
 
 static void

data/vendor/local/include/gtk-2.0/gdk/gdkenumtypes.h

@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."

data/vendor/local/include/gtk-2.0/gtk/gtkmarshal.h

@@ -1,283 +1,339 @@
 #ifndef GTK_DISABLE_DEPRECATED
+/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
+#ifndef __GTK_MARSHAL_MARSHAL_H__
+#define __GTK_MARSHAL_MARSHAL_H__
 
-#ifndef __gtk_marshal_MARSHAL_H__
-#define __gtk_marshal_MARSHAL_H__
-
-#include	<glib-object.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
 /* BOOL:NONE (./gtkmarshal.list:1) */
-extern void gtk_marshal_BOOLEAN__VOID (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__VOID (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint,
+                                gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__NONE	gtk_marshal_BOOLEAN__VOID
 
 /* BOOL:POINTER (./gtkmarshal.list:2) */
-extern void gtk_marshal_BOOLEAN__POINTER (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__POINTER (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__POINTER	gtk_marshal_BOOLEAN__POINTER
 
 /* BOOL:POINTER,POINTER,INT,INT (./gtkmarshal.list:3) */
-extern void gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT (GClosure     *closure,
-                                                          GValue       *return_value,
-                                                          guint         n_param_values,
-                                                          const GValue *param_values,
-                                                          gpointer      invocation_hint,
-                                                          gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT (GClosure     *closure,
+                                                   GValue       *return_value,
+                                                   guint         n_param_values,
+                                                   const GValue *param_values,
+                                                   gpointer      invocation_hint,
+                                                   gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__POINTER_POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT
 
 /* BOOL:POINTER,INT,INT (./gtkmarshal.list:4) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__POINTER_INT_INT (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__POINTER_INT_INT	gtk_marshal_BOOLEAN__POINTER_INT_INT
 
 /* BOOL:POINTER,INT,INT,UINT (./gtkmarshal.list:5) */
-extern void gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__POINTER_INT_INT_UINT	gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
 
 /* BOOL:POINTER,STRING,STRING,POINTER (./gtkmarshal.list:6) */
-extern void gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER (GClosure     *closure,
-                                                                GValue       *return_value,
-                                                                guint         n_param_values,
-                                                                const GValue *param_values,
-                                                                gpointer      invocation_hint,
-                                                                gpointer      marshal_data);
+extern
+void gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER (GClosure     *closure,
+                                                         GValue       *return_value,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint,
+                                                         gpointer      marshal_data);
+
 #define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER	gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER
 
 /* ENUM:ENUM (./gtkmarshal.list:7) */
-extern void gtk_marshal_ENUM__ENUM (GClosure     *closure,
-                                    GValue       *return_value,
-                                    guint         n_param_values,
-                                    const GValue *param_values,
-                                    gpointer      invocation_hint,
-                                    gpointer      marshal_data);
+extern
+void gtk_marshal_ENUM__ENUM (GClosure     *closure,
+                             GValue       *return_value,
+                             guint         n_param_values,
+                             const GValue *param_values,
+                             gpointer      invocation_hint,
+                             gpointer      marshal_data);
 
 /* INT:POINTER (./gtkmarshal.list:8) */
-extern void gtk_marshal_INT__POINTER (GClosure     *closure,
-                                      GValue       *return_value,
-                                      guint         n_param_values,
-                                      const GValue *param_values,
-                                      gpointer      invocation_hint,
-                                      gpointer      marshal_data);
+extern
+void gtk_marshal_INT__POINTER (GClosure     *closure,
+                               GValue       *return_value,
+                               guint         n_param_values,
+                               const GValue *param_values,
+                               gpointer      invocation_hint,
+                               gpointer      marshal_data);
 
 /* INT:POINTER,CHAR,CHAR (./gtkmarshal.list:9) */
-extern void gtk_marshal_INT__POINTER_CHAR_CHAR (GClosure     *closure,
-                                                GValue       *return_value,
-                                                guint         n_param_values,
-                                                const GValue *param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
+extern
+void gtk_marshal_INT__POINTER_CHAR_CHAR (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
 
 /* NONE:BOOL (./gtkmarshal.list:10) */
 #define gtk_marshal_VOID__BOOLEAN	g_cclosure_marshal_VOID__BOOLEAN
+
 #define gtk_marshal_NONE__BOOL	gtk_marshal_VOID__BOOLEAN
 
 /* NONE:BOXED (./gtkmarshal.list:11) */
 #define gtk_marshal_VOID__BOXED	g_cclosure_marshal_VOID__BOXED
+
 #define gtk_marshal_NONE__BOXED	gtk_marshal_VOID__BOXED
 
 /* NONE:ENUM (./gtkmarshal.list:12) */
 #define gtk_marshal_VOID__ENUM	g_cclosure_marshal_VOID__ENUM
+
 #define gtk_marshal_NONE__ENUM	gtk_marshal_VOID__ENUM
 
 /* NONE:ENUM,FLOAT (./gtkmarshal.list:13) */
-extern void gtk_marshal_VOID__ENUM_FLOAT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__ENUM_FLOAT (GClosure     *closure,
+                                   GValue       *return_value,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint,
+                                   gpointer      marshal_data);
+
 #define gtk_marshal_NONE__ENUM_FLOAT	gtk_marshal_VOID__ENUM_FLOAT
 
 /* NONE:ENUM,FLOAT,BOOL (./gtkmarshal.list:14) */
-extern void gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
 #define gtk_marshal_NONE__ENUM_FLOAT_BOOL	gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN
 
 /* NONE:INT (./gtkmarshal.list:15) */
 #define gtk_marshal_VOID__INT	g_cclosure_marshal_VOID__INT
+
 #define gtk_marshal_NONE__INT	gtk_marshal_VOID__INT
 
 /* NONE:INT,INT (./gtkmarshal.list:16) */
-extern void gtk_marshal_VOID__INT_INT (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__INT_INT (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint,
+                                gpointer      marshal_data);
+
 #define gtk_marshal_NONE__INT_INT	gtk_marshal_VOID__INT_INT
 
 /* NONE:INT,INT,POINTER (./gtkmarshal.list:17) */
-extern void gtk_marshal_VOID__INT_INT_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__INT_INT_POINTER (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
 #define gtk_marshal_NONE__INT_INT_POINTER	gtk_marshal_VOID__INT_INT_POINTER
 
 /* NONE:NONE (./gtkmarshal.list:18) */
 #define gtk_marshal_VOID__VOID	g_cclosure_marshal_VOID__VOID
+
 #define gtk_marshal_NONE__NONE	gtk_marshal_VOID__VOID
 
 /* NONE:OBJECT (./gtkmarshal.list:19) */
 #define gtk_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
+
 #define gtk_marshal_NONE__OBJECT	gtk_marshal_VOID__OBJECT
 
 /* NONE:POINTER (./gtkmarshal.list:20) */
 #define gtk_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
+
 #define gtk_marshal_NONE__POINTER	gtk_marshal_VOID__POINTER
 
 /* NONE:POINTER,INT (./gtkmarshal.list:21) */
-extern void gtk_marshal_VOID__POINTER_INT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_INT (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_INT	gtk_marshal_VOID__POINTER_INT
 
 /* NONE:POINTER,POINTER (./gtkmarshal.list:22) */
-extern void gtk_marshal_VOID__POINTER_POINTER (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_POINTER (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER
 
 /* NONE:POINTER,POINTER,POINTER (./gtkmarshal.list:23) */
-extern void gtk_marshal_VOID__POINTER_POINTER_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_POINTER_POINTER (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_POINTER_POINTER	gtk_marshal_VOID__POINTER_POINTER_POINTER
 
 /* NONE:POINTER,STRING,STRING (./gtkmarshal.list:24) */
-extern void gtk_marshal_VOID__POINTER_STRING_STRING (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_STRING_STRING (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_STRING_STRING	gtk_marshal_VOID__POINTER_STRING_STRING
 
 /* NONE:POINTER,UINT (./gtkmarshal.list:25) */
-extern void gtk_marshal_VOID__POINTER_UINT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_UINT (GClosure     *closure,
+                                     GValue       *return_value,
+                                     guint         n_param_values,
+                                     const GValue *param_values,
+                                     gpointer      invocation_hint,
+                                     gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_UINT	gtk_marshal_VOID__POINTER_UINT
 
 /* NONE:POINTER,UINT,ENUM (./gtkmarshal.list:26) */
-extern void gtk_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_UINT_ENUM	gtk_marshal_VOID__POINTER_UINT_ENUM
 
 /* NONE:POINTER,POINTER,UINT,UINT (./gtkmarshal.list:27) */
-extern void gtk_marshal_VOID__POINTER_POINTER_UINT_UINT (GClosure     *closure,
-                                                         GValue       *return_value,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint,
-                                                         gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_POINTER_UINT_UINT (GClosure     *closure,
+                                                  GValue       *return_value,
+                                                  guint         n_param_values,
+                                                  const GValue *param_values,
+                                                  gpointer      invocation_hint,
+                                                  gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_POINTER_UINT_UINT
 
 /* NONE:POINTER,INT,INT,POINTER,UINT,UINT (./gtkmarshal.list:28) */
-extern void gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT (GClosure     *closure,
-                                                                 GValue       *return_value,
-                                                                 guint         n_param_values,
-                                                                 const GValue *param_values,
-                                                                 gpointer      invocation_hint,
-                                                                 gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT (GClosure     *closure,
+                                                          GValue       *return_value,
+                                                          guint         n_param_values,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
+
 #define gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT
 
 /* NONE:POINTER,UINT,UINT (./gtkmarshal.list:29) */
-extern void gtk_marshal_VOID__POINTER_UINT_UINT (GClosure     *closure,
-                                                 GValue       *return_value,
-                                                 guint         n_param_values,
-                                                 const GValue *param_values,
-                                                 gpointer      invocation_hint,
-                                                 gpointer      marshal_data);
-#define gtk_marshal_NONE__POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_UINT_UINT
+extern
+void gtk_marshal_VOID__POINTER_UINT_UINT (GClosure     *closure,
+                                          GValue       *return_value,
+                                          guint         n_param_values,
+                                          const GValue *param_values,
+                                          gpointer      invocation_hint,
+                                          gpointer      marshal_data);
 
-/* NONE:POINTER,UINT,UINT (./gtkmarshal.list:30) */
+#define gtk_marshal_NONE__POINTER_UINT_UINT	gtk_marshal_VOID__POINTER_UINT_UINT
 
 /* NONE:STRING (./gtkmarshal.list:31) */
 #define gtk_marshal_VOID__STRING	g_cclosure_marshal_VOID__STRING
+
 #define gtk_marshal_NONE__STRING	gtk_marshal_VOID__STRING
 
 /* NONE:STRING,INT,POINTER (./gtkmarshal.list:32) */
-extern void gtk_marshal_VOID__STRING_INT_POINTER (GClosure     *closure,
-                                                  GValue       *return_value,
-                                                  guint         n_param_values,
-                                                  const GValue *param_values,
-                                                  gpointer      invocation_hint,
-                                                  gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__STRING_INT_POINTER (GClosure     *closure,
+                                           GValue       *return_value,
+                                           guint         n_param_values,
+                                           const GValue *param_values,
+                                           gpointer      invocation_hint,
+                                           gpointer      marshal_data);
+
 #define gtk_marshal_NONE__STRING_INT_POINTER	gtk_marshal_VOID__STRING_INT_POINTER
 
 /* NONE:UINT (./gtkmarshal.list:33) */
 #define gtk_marshal_VOID__UINT	g_cclosure_marshal_VOID__UINT
+
 #define gtk_marshal_NONE__UINT	gtk_marshal_VOID__UINT
 
 /* NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER (./gtkmarshal.list:34) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER (GClosure     *closure,
+                                                            GValue       *return_value,
+                                                            guint         n_param_values,
+                                                            const GValue *param_values,
+                                                            gpointer      invocation_hint,
+                                                            gpointer      marshal_data);
+
 #define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER	gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
 
 /* NONE:UINT,POINTER,UINT,UINT,ENUM (./gtkmarshal.list:35) */
-extern void gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM (GClosure     *closure,
-                                                           GValue       *return_value,
-                                                           guint         n_param_values,
-                                                           const GValue *param_values,
-                                                           gpointer      invocation_hint,
-                                                           gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM (GClosure     *closure,
+                                                    GValue       *return_value,
+                                                    guint         n_param_values,
+                                                    const GValue *param_values,
+                                                    gpointer      invocation_hint,
+                                                    gpointer      marshal_data);
+
 #define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM	gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
 
 /* NONE:UINT,STRING (./gtkmarshal.list:36) */
-extern void gtk_marshal_VOID__UINT_STRING (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
+extern
+void gtk_marshal_VOID__UINT_STRING (GClosure     *closure,
+                                    GValue       *return_value,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint,
+                                    gpointer      marshal_data);
+
 #define gtk_marshal_NONE__UINT_STRING	gtk_marshal_VOID__UINT_STRING
 
-G_END_DECLS
 
-#endif /* __gtk_marshal_MARSHAL_H__ */
+G_END_DECLS
 
+#endif /* __GTK_MARSHAL_MARSHAL_H__ */
 #endif /* GTK_DISABLE_DEPRECATED */