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 /embed/ephy-embed-single.c | |
| parent | 42fc55f3abdabe3e17e5abd8ff78e68fa1ae5626 (diff) | |
| download | gsoc2013-epiphany-8d08871ace1019111a50c47f473f565e4cb47307.tar.gz 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 'embed/ephy-embed-single.c')
| -rw-r--r-- | embed/ephy-embed-single.c | 7 |
1 files changed, 3 insertions, 4 deletions
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, |