aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog17
-rw-r--r--embed/ephy-embed.c26
-rw-r--r--lib/ephy-marshal.list19
-rw-r--r--lib/widgets/ephy-arrow-toolbutton.c2
-rw-r--r--src/ephy-notebook.c8
5 files changed, 39 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e5da1f88..72f7e0581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2003-11-03 Christian Persch <chpe@cvs.gnome.org>
+
+ * lib/ephy-marshal.list:
+
+ Remove unused types.
+
+ * embed/ephy-embed.c: (ephy_embed_base_init):
+ * lib/widgets/ephy-arrow-toolbutton.c:
+ (ephy_arrow_toolbutton_class_init):
+ * src/ephy-notebook.c: (ephy_notebook_class_init):
+
+ Use g_cclosure_marshal_* instead of our own ephy_marshal_*
+ where there is a one.
+
+ For signals returning a boolean, use the
+ g_signal_accumulator_true_handled accumulator.
+
2003-11-02 Xan Lopez <xan@masilla.org>
* data/epiphany.schemas.in:
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 3158a1d00..a988f9732 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -107,7 +107,7 @@ ephy_embed_base_init (gpointer g_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyEmbedClass, link_message),
NULL, NULL,
- ephy_marshal_VOID__STRING,
+ g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -116,9 +116,9 @@ ephy_embed_base_init (gpointer g_class)
EPHY_TYPE_EMBED,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EphyEmbedClass, context_menu),
- NULL, NULL,
- ephy_marshal_INT__OBJECT,
- G_TYPE_INT,
+ g_signal_accumulator_true_handled, NULL,
+ ephy_marshal_BOOLEAN__OBJECT,
+ G_TYPE_BOOLEAN,
1,
G_TYPE_OBJECT);
ephy_embed_signals[FAVICON] =
@@ -127,7 +127,7 @@ ephy_embed_base_init (gpointer g_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyEmbedClass, favicon),
NULL, NULL,
- ephy_marshal_VOID__STRING,
+ g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -137,7 +137,7 @@ ephy_embed_base_init (gpointer g_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyEmbedClass, js_status),
NULL, NULL,
- ephy_marshal_VOID__STRING,
+ g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -147,7 +147,7 @@ ephy_embed_base_init (gpointer g_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyEmbedClass, location),
NULL, NULL,
- ephy_marshal_VOID__STRING,
+ g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1,
G_TYPE_STRING);
@@ -228,9 +228,9 @@ ephy_embed_base_init (gpointer g_class)
EPHY_TYPE_EMBED,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_click),
- NULL, NULL,
- ephy_marshal_INT__OBJECT,
- G_TYPE_INT,
+ g_signal_accumulator_true_handled, NULL,
+ ephy_marshal_BOOLEAN__OBJECT,
+ G_TYPE_BOOLEAN,
1,
G_TYPE_POINTER);
ephy_embed_signals[DOM_MOUSE_DOWN] =
@@ -238,9 +238,9 @@ ephy_embed_base_init (gpointer g_class)
EPHY_TYPE_EMBED,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_down),
- NULL, NULL,
- ephy_marshal_INT__OBJECT,
- G_TYPE_INT,
+ g_signal_accumulator_true_handled, NULL,
+ ephy_marshal_BOOLEAN__OBJECT,
+ G_TYPE_BOOLEAN,
1,
G_TYPE_POINTER);
ephy_embed_signals[SECURITY_CHANGE] =
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index 622acfd50..3c5ffae41 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -1,18 +1,7 @@
-VOID:VOID
-VOID:STRING
-VOID:OBJECT
-VOID:OBJECT, POINTER
-VOID:OBJECT,OBJECT,INT
-VOID:OBJECT,STRING,INT
-VOID:OBJECT,INT
-VOID:OBJECT,INT,INT
-VOID:POINTER,INT
-VOID:STRING,INT,INT
-VOID:STRING,INT
-VOID:STRING,STRING
INT:STRING
+BOOLEAN:OBJECT
VOID:INT,INT
-VOID:INT,INT,INT
-INT:OBJECT
+VOID:POINTER,INT
VOID:POINTER,POINTER
-VOID:FLOAT
+VOID:STRING,INT
+VOID:STRING,INT,INT
diff --git a/lib/widgets/ephy-arrow-toolbutton.c b/lib/widgets/ephy-arrow-toolbutton.c
index 147c7d80b..0aa905efa 100644
--- a/lib/widgets/ephy-arrow-toolbutton.c
+++ b/lib/widgets/ephy-arrow-toolbutton.c
@@ -114,7 +114,7 @@ ephy_arrow_toolbutton_class_init (EphyArrowToolButtonClass *klass)
G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST | G_SIGNAL_RUN_CLEANUP,
G_STRUCT_OFFSET (EphyArrowToolButtonClass, menu_activated),
NULL, NULL,
- ephy_marshal_VOID__VOID,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
g_type_class_add_private (object_class, sizeof (EphyArrowToolButtonPrivate));
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 6567d12ed..14be45a87 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -142,7 +142,7 @@ ephy_notebook_class_init (EphyNotebookClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyNotebookClass, tab_added),
NULL, NULL,
- ephy_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1,
GTK_TYPE_WIDGET);
@@ -152,7 +152,7 @@ ephy_notebook_class_init (EphyNotebookClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyNotebookClass, tab_removed),
NULL, NULL,
- ephy_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1,
GTK_TYPE_WIDGET);
@@ -162,7 +162,7 @@ ephy_notebook_class_init (EphyNotebookClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyNotebookClass, tab_detached),
NULL, NULL,
- ephy_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1,
GTK_TYPE_WIDGET);
@@ -172,7 +172,7 @@ ephy_notebook_class_init (EphyNotebookClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EphyNotebookClass, tabs_reordered),
NULL, NULL,
- ephy_marshal_VOID__VOID,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);