Use the generic marshaler throughout

Just enough to get rid of ephy-marshal.h

6 files changed, 13 insertions, 19 deletions

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);
 /**