diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-30 23:20:36 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-30 23:20:36 +0800 |
| commit | 8f01817138c1852b319898a5de3f4b9f244cdea5 (patch) | |
| tree | 3473088e9fc4b6200a85e6714183e6f8482b2963 /src/ephy-tab.c | |
| parent | 58dba74abaf6313221c50629e546dc4492672486 (diff) | |
| download | gsoc2013-epiphany-8f01817138c1852b319898a5de3f4b9f244cdea5.tar.gz gsoc2013-epiphany-8f01817138c1852b319898a5de3f4b9f244cdea5.tar.zst gsoc2013-epiphany-8f01817138c1852b319898a5de3f4b9f244cdea5.zip | |
Move new-window signal to the embed single, and new window creation from
2005-01-30 Christian Persch <chpe@cvs.gnome.org>
* doc/reference/tmpl/ephy-embed.sgml:
* embed/ephy-embed-single.c: (ephy_embed_single_iface_init):
* embed/ephy-embed-single.h:
* embed/ephy-embed.c: (ephy_embed_base_init):
* embed/ephy-embed.h:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-embed.h:
* lib/ephy-marshal.list:
* lib/ephy-prefs.h:
* src/ephy-shell.c: (ephy_shell_new_window_cb),
(impl_get_embed_single):
* src/ephy-tab.c: (ephy_tab_new_window_cb):
Move new-window signal to the embed single, and new window creation
from EphyTab to EphyShell.
Diffstat (limited to 'src/ephy-tab.c')
| -rw-r--r-- | src/ephy-tab.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 009dbe2e3..b4de9b701 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -63,8 +63,6 @@ #define EPHY_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TAB, EphyTabPrivate)) -#define CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME "/apps/epiphany/lockdown/disable_javascript_chrome" - #define MAX_HIDDEN_POPUPS 5 struct _EphyTabPrivate @@ -1326,34 +1324,19 @@ ephy_tab_net_state_cb (EphyEmbed *embed, build_progress_from_requests (tab, state); } -static EphyEmbed * +static void ephy_tab_new_window_cb (EphyEmbed *embed, - EphyEmbedChrome chromemask, + EphyEmbed *new_embed, EphyTab *tab) { - EphyTab *new_tab; EphyWindow *window; - LOG ("ephy_tab_new_window_cb tab %p with parent %p chrome %d", - tab, ((GtkWidget *) tab)->parent, chromemask); + g_return_if_fail (new_embed != NULL); - if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME)) - { - window = ephy_window_new (); - } - else - { - window = ephy_window_new_with_chrome (chromemask); - } - - new_tab = ephy_tab_new (); - gtk_widget_show (GTK_WIDGET (new_tab)); - - ephy_window_add_tab (window, new_tab, -1, FALSE); + window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (new_embed))); + g_return_if_fail (window != NULL); popups_manager_add_window (tab, window); - - return ephy_tab_get_embed (new_tab); } static void |