[gtk+] gdk: Clean up marshalers



commit c93ddf62c3b0e24659618c1cab7128afa770799e
Author: Benjamin Otte <otte redhat com>
Date:   Wed Dec 13 00:47:07 2017 +0100

    gdk: Clean up marshalers
    
    Don't generate marshallers that are not needed.
    
    Use the default ones if they exist.

 gdk/gdkdisplay.c        |    3 +--
 gdk/gdkdisplaymanager.c |    3 +--
 gdk/gdkmarshalers.list  |    7 -------
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 5b198fe..efdfaf6 100644
--- 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 3faaf82..6af57cb 100644
--- 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 d70b190..c5df1db 100644
--- 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]