From 8d08871ace1019111a50c47f473f565e4cb47307 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xlopez@igalia.com>
Date: Thu, 9 Jun 2011 23:57:24 +0200
Subject: Use the generic marshaler throughout

Just enough to get rid of ephy-marshal.h
---
 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 -
 5 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src')

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