GNOME.org
 

[libwnck] libwnck: remove dependency on glib-genmarshal, use generic marshaller

commit 22eb59b4558041434968509f5c96d8c1c0073c9b
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Sat Jul 20 16:40:38 2013 +0200

    libwnck: remove dependency on glib-genmarshal, use generic marshaller

 configure.ac              |    3 ---
 libwnck/Makefile.am       |   15 +++------------
 libwnck/application.c     |    6 ++----
 libwnck/class-group.c     |    6 ++----
 libwnck/screen.c          |   45 +++++++++++++++------------------------------
 libwnck/window.c          |   25 ++++++++-----------------
 libwnck/wnck-marshal.list |   25 -------------------------
 libwnck/workspace.c       |    3 +--
 8 files changed, 31 insertions(+), 97 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ae9cbd2..6762816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,9 +150,6 @@ PKG_CHECK_MODULES([LIBWNCK],[
        $XRES_PACKAGE
 ])
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
-AC_SUBST(GLIB_GENMARSHAL)
-
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
 if test x"$GDK_PIXBUF_CSOURCE" = xno; then
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index b77e7ac..0d4371c 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -72,8 +72,8 @@ wnck_accessibility_files =                    \
        workspace-accessible-factory.c          \
        workspace-accessible-factory.h
 
-wnck_built_headers = $(wnck_built_installed_headers) wnck-marshal.h inlinepixbufs.h
-wnck_built_cfiles = wnck-enum-types.c wnck-marshal.c
+wnck_built_headers = $(wnck_built_installed_headers) inlinepixbufs.h
+wnck_built_cfiles = wnck-enum-types.c
 
 libwnck_3_la_SOURCES =                 \
        $(wnck_built_headers)   \
@@ -121,14 +121,6 @@ test_pager_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
 test_urgent_LDADD = $(LIBWNCK_LIBS)
 test_shutdown_LDADD = $(LIBWNCK_LIBS) ./$(lib_LTLIBRARIES)
 
-wnck-marshal.h: wnck-marshal.list
-       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_wnck_marshal $< --header > $@
-
-wnck-marshal.c: wnck-marshal.list wnck-marshal.h
-       $(AM_V_GEN)echo "#include <libwnck/libwnck.h>" > $@ \
-       && echo "#include \"wnck-marshal.h\"" >> $@ \
-       && $(GLIB_GENMARSHAL) --prefix=_wnck_marshal $< --body >> $@
-
 wnck-enum-types.h: $(wnck_headers)
        $(AM_V_GEN)glib-mkenums \
                --fhead "#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)\n" \
@@ -174,8 +166,7 @@ CLEANFILES =                        \
 
 EXTRA_DIST =                           \
        $(inlinepixbufs_SOURCES)        \
-       version.h.in                    \
-       wnck-marshal.list
+       version.h.in
 
 # Introspection
 -include $(INTROSPECTION_MAKEFILE)
diff --git a/libwnck/application.c b/libwnck/application.c
index f10c334..6146c0a 100644
--- a/libwnck/application.c
+++ b/libwnck/application.c
@@ -161,8 +161,7 @@ wnck_application_class_init (WnckApplicationClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckApplicationClass, name_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -176,8 +175,7 @@ wnck_application_class_init (WnckApplicationClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckApplicationClass, icon_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/libwnck/class-group.c b/libwnck/class-group.c
index 6676d49..1a033db 100644
--- a/libwnck/class-group.c
+++ b/libwnck/class-group.c
@@ -110,8 +110,7 @@ wnck_class_group_class_init (WnckClassGroupClass *class)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckClassGroupClass, name_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
   /**
    * WnckClassGroup::icon-changed:
@@ -124,8 +123,7 @@ wnck_class_group_class_init (WnckClassGroupClass *class)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckClassGroupClass, icon_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/libwnck/screen.c b/libwnck/screen.c
index cbe45ed..b89eb63 100644
--- a/libwnck/screen.c
+++ b/libwnck/screen.c
@@ -270,8 +270,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, active_window_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WINDOW);
 
   /**
@@ -287,8 +286,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, active_workspace_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WORKSPACE);
 
   /**
@@ -302,8 +300,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, window_stacking_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -318,8 +315,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, window_opened),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WINDOW);
 
   /**
@@ -334,8 +330,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, window_closed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WINDOW);
 
   /**
@@ -350,8 +345,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, workspace_created),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WORKSPACE);
 
   /**
@@ -366,8 +360,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, workspace_destroyed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_WORKSPACE);
 
   /**
@@ -382,8 +375,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, application_opened),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_APPLICATION);
 
   /**
@@ -398,8 +390,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, application_closed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_APPLICATION);
 
   /**
@@ -416,8 +407,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, class_group_opened),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_CLASS_GROUP);
 
   /**
@@ -434,8 +424,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, class_group_closed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, WNCK_TYPE_CLASS_GROUP);
 
   /**
@@ -449,8 +438,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, background_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -466,8 +454,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, showing_desktop_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -484,8 +471,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, viewports_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -501,8 +487,7 @@ wnck_screen_class_init (WnckScreenClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckScreenClass, window_manager_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/libwnck/window.c b/libwnck/window.c
index 6756f68..2cc6fac 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -35,7 +35,6 @@
 #include "xutils.h"
 #include "private.h"
 #include "wnck-enum-types.h"
-#include "wnck-marshal.h"
 
 /**
  * SECTION:window
@@ -340,8 +339,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, name_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -361,8 +359,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, state_changed),
-                  NULL, NULL,
-                  _wnck_marshal_VOID__FLAGS_FLAGS,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2,
                   WNCK_TYPE_WINDOW_STATE, WNCK_TYPE_WINDOW_STATE);
 
@@ -378,8 +375,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, workspace_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -393,8 +389,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, icon_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -411,8 +406,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, actions_changed),
-                  NULL, NULL,
-                  _wnck_marshal_VOID__FLAGS_FLAGS,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2,
                   WNCK_TYPE_WINDOW_ACTIONS,
                   WNCK_TYPE_WINDOW_ACTIONS);
@@ -428,8 +422,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, geometry_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -443,8 +436,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, class_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -458,8 +450,7 @@ wnck_window_class_init (WnckWindowClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWindowClass, role_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/libwnck/workspace.c b/libwnck/workspace.c
index 3ea6630..8847aa1 100644
--- a/libwnck/workspace.c
+++ b/libwnck/workspace.c
@@ -126,8 +126,7 @@ wnck_workspace_class_init (WnckWorkspaceClass *klass)
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (WnckWorkspaceClass, name_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]