aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--embed/ephy-embed.c18
-rw-r--r--embed/ephy-embed.h5
-rw-r--r--embed/mozilla/mozilla-embed.cpp8
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/ephy-marshal.list1
-rw-r--r--lib/ephy-signal-accumulator.c50
-rw-r--r--lib/ephy-signal-accumulator.h36
-rw-r--r--src/ephy-tab.c11
9 files changed, 124 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 76c60c218..bdef0fbb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-12-23 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-embed.c: (ephy_embed_base_init):
+ * embed/ephy-embed.h:
+ * embed/mozilla/mozilla-embed.cpp:
+ * lib/Makefile.am:
+ * lib/ephy-marshal.list:
+ A lib/ephy-signal-accumulator.c: (ephy_signal_accumulator_object):
+ A lib/ephy-signal-accumulator.h:
+ * src/ephy-tab.c: (ephy_tab_new_window_cb):
+
+ Fix new_window signal.
+
2004-12-20 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyBrowser.cpp:
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 83b2948c0..3f8c68ba3 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -23,6 +23,7 @@
#include "ephy-embed.h"
#include "ephy-marshal.h"
+#include "ephy-signal-accumulator.h"
#include "mozilla-embed-single.h"
#include "mozilla-embed.h"
@@ -104,22 +105,21 @@ ephy_embed_base_init (gpointer g_class)
/**
* EphyEmbed::ge-new-window:
* @embed:
- * @new_embed: a newly-generated child #EphyEmbed
- * @mask: @new_embed's #EphyChromeMask
+ * @mask: a #EphyChromeMask
*
* The ::ge_new_window signal is emitted when a new window has been opened by
* the embed. For example, when a JavaScript popup window is opened.
+ * Return a new #EphyEmbed.
**/
g_signal_new ("ge_new_window",
EPHY_TYPE_EMBED,
- G_SIGNAL_RUN_FIRST,
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EphyEmbedIface, new_window),
- NULL, NULL,
- ephy_marshal_VOID__POINTER_INT,
- G_TYPE_NONE,
- 2,
- G_TYPE_POINTER,
- G_TYPE_INT);
+ ephy_signal_accumulator_object, ephy_embed_get_type,
+ ephy_marshal_OBJECT__ENUM,
+ G_TYPE_OBJECT,
+ 1,
+ EPHY_TYPE_EMBED_CHROME_MASK);
/**
* EphyEmbed::ge-popup-blocked:
* @embed:
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index ab0a900d7..5da274649 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -124,9 +124,6 @@ struct _EphyEmbedIface
void (* net_state) (EphyEmbed *embed,
const char *uri,
EmbedState state);
- void (* new_window) (EphyEmbed *embed,
- EphyEmbed **new_embed,
- EphyEmbedChrome chromemask);
gboolean (* dom_mouse_click) (EphyEmbed *embed,
EphyEmbedEvent *event);
gboolean (* dom_mouse_down) (EphyEmbed *embed,
@@ -144,6 +141,8 @@ struct _EphyEmbedIface
void (* modal_alert_closed) (EphyEmbed *embed);
void (* document_type) (EphyEmbed *embed,
EmbedDocumentType type);
+ EphyEmbed * (* new_window) (EphyEmbed *embed,
+ EphyEmbedChrome chromemask);
/* Methods */
void (* load_url) (EphyEmbed *embed,
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 4a33a80ff..14a62ff46 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -1078,11 +1078,13 @@ mozilla_embed_new_window_cb (GtkMozEmbed *embed,
}
}
- g_signal_emit_by_name (membed, "ge_new_window", &new_embed, mask);
+ g_signal_emit_by_name (membed, "ge_new_window", mask, &new_embed);
g_assert (new_embed != NULL);
-
- *newEmbed = GTK_MOZ_EMBED(new_embed);
+
+ gtk_moz_embed_set_chrome_mask (GTK_MOZ_EMBED (new_embed), chrome_mask);
+
+ *newEmbed = GTK_MOZ_EMBED (new_embed);
}
static void
diff --git a/lib/Makefile.am b/lib/Makefile.am
index aef41faca..43e7de082 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,6 +20,7 @@ NOINST_H_FILES = \
ephy-node-common.h \
ephy-prefs.h \
ephy-shlib-loader.h \
+ ephy-signal-accumulator.h \
ephy-string.h \
ephy-stock-icons.h \
ephy-zoom.h
@@ -51,6 +52,7 @@ libephymisc_la_SOURCES = \
ephy-node-db.c \
ephy-prefs.h \
ephy-shlib-loader.c \
+ ephy-signal-accumulator.c \
ephy-state.c \
ephy-string.c \
ephy-stock-icons.c \
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index 81c0ffc7e..6e9daa24b 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -2,6 +2,7 @@ INT:STRING
BOOLEAN:OBJECT
BOOLEAN:STRING, STRING
BOOLEAN:VOID
+OBJECT:ENUM
VOID:ENUM
VOID:ENUM,INT,BOOLEAN
VOID:INT,INT
diff --git a/lib/ephy-signal-accumulator.c b/lib/ephy-signal-accumulator.c
new file mode 100644
index 000000000..d34273721
--- /dev/null
+++ b/lib/ephy-signal-accumulator.c
@@ -0,0 +1,50 @@
+/*
+* Copyright (C) 2004 Christian Persch
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*
+* $Id$
+*/
+
+#include "config.h"
+
+#include "ephy-signal-accumulator.h"
+
+typedef GType (* GetTypeFunc) (void);
+
+gboolean
+ephy_signal_accumulator_object (GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer accu_data)
+{
+ GObject *object;
+ GetTypeFunc get_type = (GetTypeFunc) accu_data;
+
+ object = g_value_get_object (handler_return);
+ if (object != NULL &&
+ G_TYPE_CHECK_INSTANCE_TYPE (object, get_type ()))
+ {
+ g_value_set_object (return_accu, object);
+
+ return FALSE;
+ }
+ else if (object != NULL)
+ {
+ g_return_val_if_reached (TRUE);
+ }
+
+ return TRUE;
+}
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
new file mode 100644
index 000000000..8991bcf12
--- /dev/null
+++ b/lib/ephy-signal-accumulator.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2004 Christian Persch
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ */
+
+#ifndef EPHY_SIGNAL_ACCUMULATORS_H
+#define EPHY_SIGNAL_ACCUMULATORS_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+gboolean ephy_signal_accumulator_object (GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer accu_data);
+
+
+G_END_DECLS
+
+#endif /* EPHY_SIGNAL_ACCUMULATORS_H */
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 1a461ed79..3d15e36ba 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -1297,9 +1297,10 @@ ephy_tab_net_state_cb (EphyEmbed *embed, const char *uri,
build_progress_from_requests (tab, state);
}
-static void
-ephy_tab_new_window_cb (EphyEmbed *embed, EphyEmbed **new_embed,
- EphyEmbedChrome chromemask, EphyTab *tab)
+static EphyEmbed *
+ephy_tab_new_window_cb (EphyEmbed *embed,
+ EphyEmbedChrome chromemask,
+ EphyTab *tab)
{
EphyTab *new_tab;
EphyWindow *window;
@@ -1321,9 +1322,9 @@ ephy_tab_new_window_cb (EphyEmbed *embed, EphyEmbed **new_embed,
ephy_window_add_tab (window, new_tab, -1, FALSE);
- *new_embed = ephy_tab_get_embed (new_tab);
-
popups_manager_add_window (tab, window);
+
+ return ephy_tab_get_embed (new_tab);
}
static void