From 3a4512cd91f0f0e9d5d1b6d796079c1303264175 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Oct 2011 18:06:14 -0400 Subject: [PATCH] Use generic marshaller https://bugzilla.gnome.org/show_bug.cgi?id=662153 --- src/Makefile.am | 27 ++---------------------- src/compositor/meta-shadow-factory.c | 3 +-- src/compositor/meta-window-actor.c | 6 ++---- src/core/display.c | 12 ++++------- src/core/screen.c | 31 +++++++++------------------- src/core/window.c | 12 ++++------- src/core/workspace.c | 6 ++---- src/mutter-marshal.list | 2 -- 8 files changed, 25 insertions(+), 74 deletions(-) delete mode 100644 src/mutter-marshal.list diff --git a/src/Makefile.am b/src/Makefile.am index d9cbfdaba..8759f766c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,8 +27,6 @@ INCLUDES= \ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" mutter_built_sources = \ - mutter-marshal.h \ - mutter-marshal.c \ mutter-enum-types.h \ mutter-enum-types.c @@ -307,33 +305,12 @@ EXTRA_DIST=$(desktopfiles_files) \ libmutter.pc.in \ mutter-plugins.pc.in \ mutter-enum-types.h.in \ - mutter-enum-types.c.in \ - mutter-marshal.list + mutter-enum-types.c.in BUILT_SOURCES += $(mutter_built_sources) -MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h +MUTTER_STAMP_FILES = stamp-mutter-enum-types.h CLEANFILES += $(MUTTER_STAMP_FILES) -mutter-marshal.h: stamp-mutter-marshal.h - @true -stamp-mutter-marshal.h: Makefile mutter-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ - --prefix=_mutter_marshal \ - --header \ - $(srcdir)/mutter-marshal.list > xgen-tmh && \ - (cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \ - rm -f xgen-tmh && \ - echo timestamp > $(@F) - -mutter-marshal.c: Makefile mutter-marshal.list - $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \ - $(GLIB_GENMARSHAL) \ - --prefix=_mutter_marshal \ - --body \ - $(srcdir)/mutter-marshal.list ) > xgen-tmc && \ - cp -f xgen-tmc mutter-marshal.c && \ - rm -f xgen-tmc - mutter-enum-types.h: stamp-mutter-enum-types.h Makefile @true stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c index 80403b8fe..8403ed655 100644 --- a/src/compositor/meta-shadow-factory.c +++ b/src/compositor/meta-shadow-factory.c @@ -442,8 +442,7 @@ meta_shadow_factory_class_init (MetaShadowFactoryClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index b69049f36..d2dea5b1c 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -232,15 +232,13 @@ meta_window_actor_class_init (MetaWindowActorClass *klass) g_signal_new ("position-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); signals[SIZE_CHANGED] = g_signal_new ("size-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/src/core/display.c b/src/core/display.c index f2dfd200a..1e7b48a52 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -230,8 +230,7 @@ meta_display_class_init (MetaDisplayClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); display_signals[WINDOW_CREATED] = @@ -239,8 +238,7 @@ meta_display_class_init (MetaDisplayClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, META_TYPE_WINDOW); display_signals[WINDOW_DEMANDS_ATTENTION] = @@ -248,8 +246,7 @@ meta_display_class_init (MetaDisplayClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, META_TYPE_WINDOW); display_signals[WINDOW_MARKED_URGENT] = @@ -257,8 +254,7 @@ meta_display_class_init (MetaDisplayClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, META_TYPE_WINDOW); diff --git a/src/core/screen.c b/src/core/screen.c index bb5815a28..0fb7f08cb 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -39,7 +39,6 @@ #include "stack.h" #include "xprops.h" #include -#include "mutter-marshal.h" #include "mutter-enum-types.h" #ifdef HAVE_SOLARIS_XINERAMA @@ -162,8 +161,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaScreenClass, restacked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); pspec = g_param_spec_int ("n-workspaces", @@ -177,8 +175,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -188,8 +185,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -199,8 +195,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _mutter_marshal_VOID__INT_INT_ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_INT, @@ -212,8 +207,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _mutter_marshal_VOID__INT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, META_TYPE_WINDOW); @@ -223,8 +217,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _mutter_marshal_VOID__INT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, META_TYPE_WINDOW); @@ -234,8 +227,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); screen_signals[TOGGLE_RECORDING] = @@ -243,8 +235,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); screen_signals[WORKAREAS_CHANGED] = @@ -252,8 +243,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaScreenClass, workareas_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); screen_signals[MONITORS_CHANGED] = @@ -261,8 +251,7 @@ meta_screen_class_init (MetaScreenClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaScreenClass, monitors_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); g_object_class_install_property (object_class, diff --git a/src/core/window.c b/src/core/window.c index 58e097cac..252c8f5fd 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -455,8 +455,7 @@ meta_window_class_init (MetaWindowClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaWindowClass, workspace_changed), - NULL, NULL, - g_cclosure_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); @@ -465,8 +464,7 @@ meta_window_class_init (MetaWindowClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaWindowClass, focus), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); window_signals[RAISED] = @@ -474,8 +472,7 @@ meta_window_class_init (MetaWindowClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaWindowClass, raised), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); window_signals[UNMANAGED] = @@ -483,8 +480,7 @@ meta_window_class_init (MetaWindowClass *klass) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MetaWindowClass, unmanaged), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/src/core/workspace.c b/src/core/workspace.c index ffadd398f..5930d76bb 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -121,16 +121,14 @@ meta_workspace_class_init (MetaWorkspaceClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, META_TYPE_WINDOW); signals[WINDOW_REMOVED] = g_signal_new ("window-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, META_TYPE_WINDOW); diff --git a/src/mutter-marshal.list b/src/mutter-marshal.list deleted file mode 100644 index becfcf63f..000000000 --- a/src/mutter-marshal.list +++ /dev/null @@ -1,2 +0,0 @@ -VOID:INT,INT,ENUM -VOID:INT,OBJECT