diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-10 05:57:24 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-14 18:55:32 +0800 |
| commit | 8d08871ace1019111a50c47f473f565e4cb47307 (patch) | |
| tree | a9628e45c2f891d2d2da2268ea487aedb241817e /lib | |
| parent | 42fc55f3abdabe3e17e5abd8ff78e68fa1ae5626 (diff) | |
| download | gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.gz gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.bz2 gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.lz gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.xz gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.zst gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.zip | |
Use the generic marshaler throughout
Just enough to get rid of ephy-marshal.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 23 | ||||
| -rw-r--r-- | lib/widgets/ephy-location-entry.c | 5 | ||||
| -rw-r--r-- | lib/widgets/ephy-node-view.c | 5 | ||||
| -rw-r--r-- | lib/widgets/ephy-tree-model-sort.c | 1 |
4 files changed, 6 insertions, 28 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 63d58db1e..a75896bb0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -125,9 +125,7 @@ ephy_profile_migrator_CPPFLAGS = \ BUILT_SOURCES = \ ephy-lib-type-builtins.c \ - ephy-lib-type-builtins.h \ - ephy-marshal.c \ - ephy-marshal.h + ephy-lib-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) @@ -135,21 +133,7 @@ MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-lib-type-builtins.c \ - stamp-ephy-lib-type-builtins.h \ - stamp-ephy-marshal.c \ - stamp-ephy-marshal.h - -ephy-marshal.c: stamp-ephy-marshal.c - @true -stamp-ephy-marshal.c: ephy-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header --body > ephy-marshal.c \ - && echo timestamp > $(@F) - -ephy-marshal.h: stamp-ephy-marshal.h - @true -stamp-ephy-marshal.h: ephy-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ephy_marshal $(srcdir)/ephy-marshal.list --header > ephy-marshal.h \ - && echo timestamp > $(@F) + stamp-ephy-lib-type-builtins.h ephy-lib-type-builtins.c: stamp-ephy-lib-type-builtins.c Makefile @true @@ -192,6 +176,3 @@ stamp-ephy-lib-type-builtins.h: Makefile $(TYPES_H_FILES) && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) - -EXTRA_DIST = \ - ephy-marshal.list diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index cb8d9b363..e67b3e904 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -25,7 +25,6 @@ #include "ephy-tree-model-node.h" #include "ephy-location-entry.h" -#include "ephy-marshal.h" #include "ephy-signal-accumulator.h" #include "ephy-dnd.h" #include "egg-editable-toolbar.h" @@ -212,7 +211,7 @@ ephy_location_entry_class_init (EphyLocationEntryClass *klass) G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyLocationEntryClass, get_location), ephy_signal_accumulator_string, NULL, - ephy_marshal_STRING__VOID, + g_cclosure_marshal_generic, G_TYPE_STRING, 0, G_TYPE_NONE); @@ -232,7 +231,7 @@ ephy_location_entry_class_init (EphyLocationEntryClass *klass) G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyLocationEntryClass, get_title), ephy_signal_accumulator_string, NULL, - ephy_marshal_STRING__VOID, + g_cclosure_marshal_generic, G_TYPE_STRING, 0, G_TYPE_NONE); diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index eabdaa422..e30a5364d 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -28,7 +28,6 @@ #include "eggtreemultidnd.h" #include "ephy-dnd.h" #include "ephy-gui.h" -#include "ephy-marshal.h" #include <string.h> /** @@ -1858,7 +1857,7 @@ ephy_node_view_class_init (EphyNodeViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyNodeViewClass, node_toggled), NULL, NULL, - ephy_marshal_VOID__POINTER_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_POINTER, @@ -1911,7 +1910,7 @@ ephy_node_view_class_init (EphyNodeViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyNodeViewClass, node_dropped), NULL, NULL, - ephy_marshal_VOID__POINTER_POINTER, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_POINTER, diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c index 263d7dc30..aeeb7652b 100644 --- a/lib/widgets/ephy-tree-model-sort.c +++ b/lib/widgets/ephy-tree-model-sort.c @@ -26,7 +26,6 @@ #include "ephy-tree-model-sort.h" #include "eggtreemultidnd.h" #include "ephy-dnd.h" -#include "ephy-marshal.h" #include "ephy-debug.h" /** |