diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-12-13 00:47:07 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-12-13 00:56:52 +0100 |
| commit | c93ddf62c3b0e24659618c1cab7128afa770799e (patch) | |
| tree | 77c54cc7e40120852e980a47ed7a99bb6f6ca195 | |
| parent | 0d1ea056580c41112c17b1dbdd6e3f500fdcf186 (diff) | |
| download | gtk+-c93ddf62c3b0e24659618c1cab7128afa770799e.tar.gz | |
gdk: Clean up marshalers
Don't generate marshallers that are not needed.
Use the default ones if they exist.
| -rw-r--r-- | gdk/gdkdisplay.c | 3 | ||||
| -rw-r--r-- | gdk/gdkdisplaymanager.c | 3 | ||||
| -rw-r--r-- | gdk/gdkmarshalers.list | 7 |
3 files changed, 2 insertions, 11 deletions
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 5b198fe2e1..efdfaf6fc8 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 3faaf82e12..6af57cb704 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 d70b190dcc..c5df1db202 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 |