diff options
| author | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-12-11 00:24:45 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-12-11 01:08:40 +0800 |
| commit | e65754da16f9af433cd90279b60855705855253a (patch) | |
| tree | 1e9229965f9a2ff0552e202e2df91bee59dba928 /src/ephy-shell.c | |
| parent | 43587a75794e27225c71d485620f875b12338ac1 (diff) | |
| download | gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar.gz gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar.bz2 gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar.lz gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar.xz gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.tar.zst gsoc2013-epiphany-e65754da16f9af433cd90279b60855705855253a.zip | |
e-embed-shell: remove the embed_shell global
https://bugzilla.gnome.org/show_bug.cgi?id=683614
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 29dcd90c3..eb9789166 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -720,6 +720,7 @@ ephy_shell_new_tab_full (EphyShell *shell, gboolean is_popup, guint32 user_time) { + EphyEmbedShell *embed_shell; EphyWindow *window; EphyEmbed *embed = NULL; gboolean fullscreen_lockdown = FALSE; @@ -731,6 +732,8 @@ ephy_shell_new_tab_full (EphyShell *shell, gboolean is_empty = FALSE; int position = -1; + embed_shell = ephy_embed_shell_get_default (); + if (flags & EPHY_NEW_TAB_OPEN_PAGE) open_page = TRUE; if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE; if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE; @@ -951,8 +954,11 @@ ephy_shell_get_bookmarks_editor (EphyShell *shell) GtkWidget * ephy_shell_get_history_window (EphyShell *shell) { + EphyEmbedShell *embed_shell; EphyHistoryService *service; + embed_shell = ephy_embed_shell_get_default (); + if (shell->priv->history_window == NULL) { service = EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (embed_shell)); |