GNOME.org
 

[devhelp] Do not use custom marshallers

commit 076f23f95655f5fbb47003edb64a481c4e8e696c
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Mar 12 14:34:25 2012 +0000

    Do not use custom marshallers
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=671907

 .gitignore            |    2 --
 configure.ac          |    1 -
 src/.cvsignore        |    2 --
 src/Makefile.am       |   11 -----------
 src/dh-book-manager.c |   13 ++++++-------
 src/dh-book-tree.c    |    3 +--
 src/dh-book.c         |    9 ++++-----
 src/dh-settings.c     |    4 +---
 src/dh-sidebar.c      |    3 +--
 src/dh-window.c       |    3 +--
 10 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b5bd0f..a2a35f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,6 @@ libtool
 /misc/gedit-plugin/devhelp.desktop
 /misc/gedit-plugin/devhelp.plugin
 /src/devhelp
-/src/dh-marshal.c
-/src/dh-marshal.h
 /src/dh-enum-types.c
 /src/dh-enum-types.h
 /src/dh-resources.c
diff --git a/configure.ac b/configure.ac
index 4f84f3a..13c6108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,6 @@ GETTEXT_PACKAGE=devhelp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name for gettext])
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
 AM_PATH_PYTHON([2.3],[],[no])
diff --git a/src/.cvsignore b/src/.cvsignore
index da2d580..7f4e10d 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -3,8 +3,6 @@ Makefile.in
 .deps
 .libs
 devhelp
-dh-marshal.c
-dh-marshal.h
 test-profile
 *.loT
 default-prefs.js
diff --git a/src/Makefile.am b/src/Makefile.am
index 623b22b..cd66e7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,3 @@
-dh-marshal.h: dh-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_dh_marshal dh-marshal.list > $@
-
-dh-marshal.c: dh-marshal.list
-	$(AM_V_GEN) echo "#include \"dh-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=_dh_marshal dh-marshal.list >> $@
 
 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/dh.gresource.xml)
 dh-resources.c: dh.gresource.xml $(resource_files)
@@ -12,8 +6,6 @@ dh-resources.h: dh.gresource.xml $(resource_files)
 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dh $(srcdir)/dh.gresource.xml
 
 BUILT_SOURCES = 		\
-	dh-marshal.h		\
-	dh-marshal.c		\
 	dh-enum-types.h		\
 	dh-enum-types.c		\
 	dh-resources.c	 	\
@@ -21,7 +13,6 @@ BUILT_SOURCES = 		\
 	$(NULL)
 
 EXTRA_DIST =			\
-	dh-marshal.list		\
 	dh-enum-types.c.template \
 	dh-enum-types.h.template \
 	$(resource_files)	\
@@ -78,8 +69,6 @@ devhelpincludedir = $(includedir)/devhelp-3.0/devhelp
 devhelpinclude_HEADERS = $(INST_H_FILES)
 
 libdevhelp_3_la_SOURCES =				\
-	dh-marshal.c					\
-	dh-marshal.h					\
 	dh-enum-types.c					\
 	dh-enum-types.h					\
 	dh-app.c					\
diff --git a/src/dh-book-manager.c b/src/dh-book-manager.c
index fe14534..06b0c49 100644
--- a/src/dh-book-manager.c
+++ b/src/dh-book-manager.c
@@ -29,7 +29,6 @@
 #include "dh-book.h"
 #include "dh-language.h"
 #include "dh-book-manager.h"
-#include "dh-marshal.h"
 #include "dh-settings.h"
 
 #define NEW_POSSIBLE_BOOK_TIMEOUT_SECS 5
@@ -150,7 +149,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__OBJECT,
+                              g_cclosure_marshal_VOID__OBJECT,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_OBJECT);
@@ -160,7 +159,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__OBJECT,
+                              g_cclosure_marshal_VOID__OBJECT,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_OBJECT);
@@ -170,7 +169,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__OBJECT,
+                              g_cclosure_marshal_VOID__OBJECT,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_OBJECT);
@@ -180,7 +179,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__OBJECT,
+                              g_cclosure_marshal_VOID__OBJECT,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_OBJECT);
@@ -191,7 +190,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__STRING,
+                              g_cclosure_marshal_VOID__STRING,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_STRING);
@@ -201,7 +200,7 @@ dh_book_manager_class_init (DhBookManagerClass *klass)
                               G_SIGNAL_RUN_LAST,
                               0,
                               NULL, NULL,
-                              _dh_marshal_VOID__STRING,
+                              g_cclosure_marshal_VOID__STRING,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_STRING);
diff --git a/src/dh-book-tree.c b/src/dh-book-tree.c
index 44dfa23..7258a3c 100644
--- a/src/dh-book-tree.c
+++ b/src/dh-book-tree.c
@@ -26,7 +26,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "dh-marshal.h"
 #include "dh-book-tree.h"
 #include "dh-book.h"
 
@@ -99,7 +98,7 @@ dh_book_tree_class_init (DhBookTreeClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _dh_marshal_VOID__POINTER,
+			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 
diff --git a/src/dh-book.c b/src/dh-book.c
index afc6c38..77fed22 100644
--- a/src/dh-book.c
+++ b/src/dh-book.c
@@ -29,7 +29,6 @@
 #include "dh-link.h"
 #include "dh-parser.h"
 #include "dh-book.h"
-#include "dh-marshal.h"
 #include "dh-util.h"
 
 /* Timeout to wait for new events in the book so that
@@ -150,7 +149,7 @@ dh_book_class_init (DhBookClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              0,
 		              NULL, NULL,
-                              _dh_marshal_VOID__VOID,
+                              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE,
                               0);
 
@@ -160,7 +159,7 @@ dh_book_class_init (DhBookClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              0,
 		              NULL, NULL,
-                              _dh_marshal_VOID__VOID,
+                              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE,
                               0);
 
@@ -171,7 +170,7 @@ dh_book_class_init (DhBookClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              0,
 		              NULL, NULL,
-                              _dh_marshal_VOID__VOID,
+                              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE,
                               0);
 
@@ -181,7 +180,7 @@ dh_book_class_init (DhBookClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              0,
 		              NULL, NULL,
-                              _dh_marshal_VOID__VOID,
+                              g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE,
 		              0);
 
diff --git a/src/dh-settings.c b/src/dh-settings.c
index e570b95..b50e597 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -22,7 +22,6 @@
 
 
 #include "dh-settings.h"
-#include "dh-marshal.h"
 
 G_DEFINE_TYPE (DhSettings, dh_settings, G_TYPE_OBJECT);
 
@@ -123,7 +122,7 @@ dh_settings_class_init (DhSettingsClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (DhSettingsClass, fonts_changed),
                               NULL, NULL,
-                              _dh_marshal_VOID__STRING_STRING,
+                              g_cclosure_marshal_generic,
                               G_TYPE_NONE,
                               2,
                               G_TYPE_STRING,
@@ -216,4 +215,3 @@ dh_settings_peek_assistant_settings (DhSettings *self)
 {
         return self->priv->settings_assistant;
 }
-
diff --git a/src/dh-sidebar.c b/src/dh-sidebar.c
index 6180a18..650489e 100644
--- a/src/dh-sidebar.c
+++ b/src/dh-sidebar.c
@@ -29,7 +29,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "dh-marshal.h"
 #include "dh-keyword-model.h"
 #include "dh-sidebar.h"
 #include "dh-util.h"
@@ -577,7 +576,7 @@ dh_sidebar_class_init (DhSidebarClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (DhSidebarClass, link_selected),
                               NULL, NULL,
-                              _dh_marshal_VOID__POINTER,
+                              g_cclosure_marshal_VOID__POINTER,
                               G_TYPE_NONE,
                               1, G_TYPE_POINTER);
 }
diff --git a/src/dh-window.c b/src/dh-window.c
index 79a6864..4821489 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -39,7 +39,6 @@
 #include "dh-sidebar.h"
 #include "dh-window.h"
 #include "dh-util.h"
-#include "dh-marshal.h"
 #include "dh-enum-types.h"
 #include "dh-settings.h"
 #include "eggfindbar.h"
@@ -573,7 +572,7 @@ dh_window_class_init (DhWindowClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (DhWindowClass, open_link),
                               NULL, NULL,
-                              _dh_marshal_VOID__STRING_FLAGS,
+                              g_cclosure_marshal_generic,
                               G_TYPE_NONE,
                               2,
                               G_TYPE_STRING,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]