gdk: Clean up marshalers

Don't generate marshallers that are not needed.

Use the default ones if they exist.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 5b198fe2e12ea70e9b65dc05dea029c70062acb0..efdfaf6fc8c2ad38246b313e5767b5ec005878a5 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -33,7 +33,6 @@
 #include "gdkevents.h"
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
-#include "gdkmarshalers.h"
 #include "gdkmonitorprivate.h"
 
 #include <math.h>
@@ -243,7 +242,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GdkDisplayClass, closed),
                  NULL, NULL,
-                 _gdk_marshal_VOID__BOOLEAN,
+                  g_cclosure_marshal_VOID__BOOLEAN,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_BOOLEAN);

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 3faaf82e12ac679cd3146112ac2d69813fe6da48..6af57cb70499593c878300acffe04869ffe145d0 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -29,7 +29,6 @@
 #include "gdkdisplayprivate.h"
 #include "gdkinternals.h"
 #include "gdkkeysprivate.h"
-#include "gdkmarshalers.h"
 #include "gdkintl.h"
 
 #ifdef GDK_WINDOWING_X11
@@ -157,7 +156,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
                   NULL, NULL,
-                  _gdk_marshal_VOID__OBJECT,
+                  g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
                   1,
                   GDK_TYPE_DISPLAY);

diff --git a/gdk/gdkmarshalers.list b/gdk/gdkmarshalers.list
index d70b190dccc5d0214b96c1f37313756ac69ad5f2..c5df1db2023aec3bf9dde5d3f7407f7ecb944b0d 100644 (file)
--- a/gdk/gdkmarshalers.list
+++ b/gdk/gdkmarshalers.list
@@ -1,9 +1,2 @@
-VOID:OBJECT
-VOID:BOOLEAN
-VOID:POINTER,POINTER,POINTER
-OBJECT:VOID
-OBJECT:DOUBLE,DOUBLE
-BOXED:INT,INT
 BOXED:POINTER
-VOID:DOUBLE,DOUBLE,POINTER,POINTER
 VOID:POINTER,POINTER,BOOLEAN,BOOLEAN