From 8d08871ace1019111a50c47f473f565e4cb47307 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Thu, 9 Jun 2011 23:57:24 +0200 Subject: Use the generic marshaler throughout Just enough to get rid of ephy-marshal.h --- configure.ac | 2 +- embed/ephy-download.c | 3 +-- embed/ephy-embed-shell.c | 1 - embed/ephy-embed-single.c | 7 +++---- embed/ephy-history.c | 7 +++---- embed/ephy-permission-manager.c | 1 - embed/ephy-web-view.c | 13 ++++++------- lib/Makefile.am | 23 ++--------------------- lib/widgets/ephy-location-entry.c | 5 ++--- lib/widgets/ephy-node-view.c | 5 ++--- lib/widgets/ephy-tree-model-sort.c | 1 - src/bookmarks/ephy-bookmarks.c | 3 +-- src/ephy-dbus.c | 5 ++--- src/ephy-link.c | 3 +-- src/ephy-notebook.c | 1 - src/ephy-tabs-menu.c | 1 - 16 files changed, 24 insertions(+), 57 deletions(-) diff --git a/configure.ac b/configure.ac index 218841517..d2b9fa1d6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ if test "$enable_maintainer_mode" = "yes"; then DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE" fi -GLIB_REQUIRED=2.25.13 +GLIB_REQUIRED=2.30 GTK_REQUIRED=3.0.2 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 diff --git a/embed/ephy-download.c b/embed/ephy-download.c index 51f08ea84..aa506ef77 100644 --- a/embed/ephy-download.c +++ b/embed/ephy-download.c @@ -30,7 +30,6 @@ #include "ephy-embed-shell.h" #include "ephy-embed-type-builtins.h" #include "ephy-file-helpers.h" -#include "ephy-marshal.h" #include "ephy-prefs.h" #include "ephy-settings.h" @@ -815,7 +814,7 @@ ephy_download_class_init (EphyDownloadClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyDownloadClass, error), NULL, NULL, - ephy_marshal_BOOLEAN__INT_INT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index a0d77cdc6..de147b489 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -34,7 +34,6 @@ #include "ephy-favicon-cache.h" #include "ephy-file-helpers.h" #include "ephy-history.h" -#include "ephy-marshal.h" #include "ephy-print-utils.h" diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 846d72805..1d7ae2fb9 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -30,7 +30,6 @@ #include "ephy-embed-type-builtins.h" #include "ephy-debug.h" #include "ephy-file-helpers.h" -#include "ephy-marshal.h" #include "ephy-signal-accumulator.h" #include "ephy-permission-manager.h" #include "ephy-profile-utils.h" @@ -310,7 +309,7 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass) G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyEmbedSingleClass, new_window), ephy_signal_accumulator_object, ephy_embed_get_type, - ephy_marshal_OBJECT__OBJECT_FLAGS, + g_cclosure_marshal_generic, GTK_TYPE_WIDGET, 2, GTK_TYPE_WIDGET, @@ -334,7 +333,7 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyEmbedSingleClass, handle_content), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 2, G_TYPE_STRING, @@ -355,7 +354,7 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyEmbedSingleClass, add_search_engine), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, diff --git a/embed/ephy-history.c b/embed/ephy-history.c index b6fe5dc4b..0964dca95 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -21,7 +21,6 @@ #include "config.h" #include "ephy-history.h" -#include "ephy-marshal.h" #include "ephy-file-helpers.h" #include "ephy-debug.h" #include "ephy-node-db.h" @@ -152,7 +151,7 @@ ephy_history_class_init (EphyHistoryClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyHistoryClass, add_page), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__STRING_BOOLEAN_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, @@ -186,7 +185,7 @@ ephy_history_class_init (EphyHistoryClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyHistoryClass, redirect), NULL, NULL, - ephy_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, @@ -198,7 +197,7 @@ ephy_history_class_init (EphyHistoryClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyHistoryClass, icon_updated), NULL, NULL, - ephy_marshal_VOID__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); diff --git a/embed/ephy-permission-manager.c b/embed/ephy-permission-manager.c index 2deaf94b9..7de700fb4 100644 --- a/embed/ephy-permission-manager.c +++ b/embed/ephy-permission-manager.c @@ -22,7 +22,6 @@ #include "ephy-permission-manager.h" #include "ephy-embed-type-builtins.h" -#include "ephy-marshal.h" #include "ephy-debug.h" GType diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index 31947954b..015a3236a 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -39,7 +39,6 @@ #include "ephy-embed-utils.h" #include "ephy-file-helpers.h" #include "ephy-prefs.h" -#include "ephy-marshal.h" #include "ephy-permission-manager.h" #include "ephy-profile-utils.h" #include "ephy-favicon-cache.h" @@ -1329,7 +1328,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyWebViewClass, popup_blocked), NULL, NULL, - ephy_marshal_VOID__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, @@ -1351,7 +1350,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyWebViewClass, search_link), NULL, NULL, - ephy_marshal_VOID__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, @@ -1373,7 +1372,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyWebViewClass, feed_link), NULL, NULL, - ephy_marshal_VOID__STRING_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, @@ -1393,7 +1392,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyWebViewClass, modal_alert), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__VOID, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 0); /** @@ -1425,7 +1424,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyWebViewClass, search_key_press), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__BOXED, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -1443,7 +1442,7 @@ ephy_web_view_class_init (EphyWebViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyWebViewClass, close_request), g_signal_accumulator_true_handled, NULL, - ephy_marshal_BOOLEAN__VOID, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 0); /** 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 /** @@ -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" /** diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index 9708da5cf..1cd51e639 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -35,7 +35,6 @@ #include "ephy-bookmark-properties.h" #include "ephy-prefs.h" #include "ephy-settings.h" -#include "ephy-marshal.h" #include "ephy-signal-accumulator.h" #include "ephy-stock-icons.h" @@ -159,7 +158,7 @@ ephy_bookmarks_class_init (EphyBookmarksClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyBookmarksClass, resolve_address), ephy_signal_accumulator_string, NULL, - ephy_marshal_STRING__STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_STRING, 2, G_TYPE_STRING, diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c index a00c81d51..5fe4f8abf 100644 --- a/src/ephy-dbus.c +++ b/src/ephy-dbus.c @@ -22,7 +22,6 @@ #include "ephy-dbus.h" #include "ephy-type-builtins.h" -#include "ephy-marshal.h" #include "ephy-debug.h" #include "ephy-activation.h" #include "ephy-dbus-server-bindings.h" @@ -408,7 +407,7 @@ ephy_dbus_class_init (EphyDbusClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyDbusClass, connected), NULL, NULL, - ephy_marshal_VOID__ENUM, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EPHY_TYPE_DBUS_BUS); @@ -419,7 +418,7 @@ ephy_dbus_class_init (EphyDbusClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EphyDbusClass, disconnected), NULL, NULL, - ephy_marshal_VOID__ENUM, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EPHY_TYPE_DBUS_BUS); diff --git a/src/ephy-link.c b/src/ephy-link.c index 46cb9a19d..ca735886c 100644 --- a/src/ephy-link.c +++ b/src/ephy-link.c @@ -23,7 +23,6 @@ #include "ephy-embed-utils.h" #include "ephy-type-builtins.h" -#include "ephy-marshal.h" #include "ephy-signal-accumulator.h" #include "ephy-gui.h" #include "ephy-debug.h" @@ -61,7 +60,7 @@ ephy_link_base_init (gpointer g_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EphyLinkIface, open_link), ephy_signal_accumulator_object, ephy_embed_get_type, - ephy_marshal_OBJECT__STRING_OBJECT_FLAGS, + g_cclosure_marshal_generic, GTK_TYPE_WIDGET /* Can't use an interface type here */, 3, G_TYPE_STRING, diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index b5b4def54..3d2e365bc 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -25,7 +25,6 @@ #include "ephy-notebook.h" #include "ephy-prefs.h" #include "ephy-settings.h" -#include "ephy-marshal.h" #include "ephy-file-helpers.h" #include "ephy-dnd.h" #include "ephy-embed.h" diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index db76129e5..2cb79b65a 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -23,7 +23,6 @@ #include "ephy-tabs-menu.h" #include "ephy-notebook.h" -#include "ephy-marshal.h" #include "ephy-shell.h" #include "ephy-debug.h" #include "ephy-embed-container.h" -- cgit v1.2.3