diff options
| author | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-12-11 00:48:36 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <diegoe@igalia.com> | 2012-12-11 01:09:44 +0800 |
| commit | 533c34899f09a1fa0e80aa198bd72ec2a90b1689 (patch) | |
| tree | f11f94d4c0e12703cd3a1d1379ccdea6e0cbe852 /src/ephy-window.c | |
| parent | e65754da16f9af433cd90279b60855705855253a (diff) | |
| download | gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar.gz gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar.bz2 gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar.lz gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar.xz gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.tar.zst gsoc2013-epiphany-533c34899f09a1fa0e80aa198bd72ec2a90b1689.zip | |
ephy-shell: remove the ephy_shell global
https://bugzilla.gnome.org/show_bug.cgi?id=683614
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 6c263ed9a..64c7be8ee 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -606,7 +606,7 @@ ephy_window_open_link (EphyLink *link, } new_embed = ephy_shell_new_tab - (ephy_shell, + (ephy_shell_get_default (), EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))), embed, address, ntflags); } @@ -1724,7 +1724,7 @@ sync_network_status (EphyEmbedSingle *single, GtkAction *action; gboolean is_online; - GNetworkMonitor *monitor = G_NETWORK_MONITOR (ephy_shell_get_net_monitor (ephy_shell)); + GNetworkMonitor *monitor = G_NETWORK_MONITOR (ephy_shell_get_net_monitor (ephy_shell_get_default ())); is_online = g_network_monitor_get_network_available (monitor); action = gtk_action_group_get_action (priv->action_group, @@ -4137,7 +4137,7 @@ EphyWindow * ephy_window_new (void) { return g_object_new (EPHY_TYPE_WINDOW, - "application", GTK_APPLICATION (ephy_shell), + "application", GTK_APPLICATION (ephy_shell_get_default ()), NULL); } @@ -4157,7 +4157,7 @@ ephy_window_new_with_chrome (EphyWebViewChrome chrome, return g_object_new (EPHY_TYPE_WINDOW, "chrome", chrome, "is-popup", is_popup, - "application", GTK_APPLICATION (ephy_shell), + "application", GTK_APPLICATION (ephy_shell_get_default ()), NULL); } @@ -4448,9 +4448,9 @@ ephy_window_close (EphyWindow *window) } /* If this is the last window, save its state in the session. */ - if (ephy_shell_get_n_windows (ephy_shell) == 1) + if (ephy_shell_get_n_windows (ephy_shell_get_default ()) == 1) { - ephy_session_close (EPHY_SESSION (ephy_shell_get_session (ephy_shell))); + ephy_session_close (EPHY_SESSION (ephy_shell_get_session (ephy_shell_get_default ()))); } /* See bug #114689 */ |