aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-embed.c2
-rw-r--r--lib/ephy-marshal.list2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bdef0fbb0..2bdfa446f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-24 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-embed.c: (ephy_embed_base_init):
+ * lib/ephy-marshal.list:
+
+ EphyEmbedChrome is flags, not enum.
+
2004-12-23 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed.c: (ephy_embed_base_init):
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 3f8c68ba3..2719808e4 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -116,7 +116,7 @@ ephy_embed_base_init (gpointer g_class)
G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EphyEmbedIface, new_window),
ephy_signal_accumulator_object, ephy_embed_get_type,
- ephy_marshal_OBJECT__ENUM,
+ ephy_marshal_OBJECT__FLAGS,
G_TYPE_OBJECT,
1,
EPHY_TYPE_EMBED_CHROME_MASK);
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index 6e9daa24b..57d064177 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -2,7 +2,7 @@ INT:STRING
BOOLEAN:OBJECT
BOOLEAN:STRING, STRING
BOOLEAN:VOID
-OBJECT:ENUM
+OBJECT:FLAGS
VOID:ENUM
VOID:ENUM,INT,BOOLEAN
VOID:INT,INT