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-history-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-history-window.c')
| -rw-r--r-- | src/ephy-history-window.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 70daa107b..1d8df417a 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -302,7 +302,7 @@ get_target_window (EphyHistoryWindow *editor) } else { - return GTK_WIDGET (gtk_application_get_active_window (GTK_APPLICATION (ephy_shell))); + return GTK_WIDGET (gtk_application_get_active_window (GTK_APPLICATION (ephy_shell_get_default ()))); } } @@ -320,8 +320,10 @@ cmd_open_bookmarks_in_tabs (GtkAction *action, for (l = selection; l; l = l->next) { EphyHistoryURL *url = l->data; - ephy_shell_new_tab (ephy_shell, window, NULL, url->url, - EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_EXISTING_WINDOW); + ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, url->url, + EPHY_NEW_TAB_OPEN_PAGE | + EPHY_NEW_TAB_IN_EXISTING_WINDOW); } g_list_free_full (selection, (GDestroyNotify) ephy_history_url_free); @@ -341,7 +343,8 @@ cmd_open_bookmarks_in_browser (GtkAction *action, for (l = selection; l; l = l->next) { EphyHistoryURL *url = l->data; - ephy_shell_new_tab (ephy_shell, window, NULL, url->url, + ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, url->url, EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_NEW_WINDOW); } @@ -566,7 +569,8 @@ ephy_history_window_row_activated_cb (GtkTreeView *view, path); g_return_if_fail (url != NULL); - ephy_shell_new_tab (ephy_shell, NULL, NULL, url->url, + ephy_shell_new_tab (ephy_shell_get_default (), + NULL, NULL, url->url, EPHY_NEW_TAB_OPEN_PAGE); ephy_history_url_free (url); } @@ -583,7 +587,8 @@ ephy_history_window_row_middle_clicked_cb (EphyHistoryView *view, url = ephy_urls_store_get_url_from_path (editor->priv->urls_store, path); g_return_if_fail (url != NULL); - ephy_shell_new_tab (ephy_shell, window, NULL, url->url, + ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, url->url, EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_EXISTING_WINDOW); ephy_history_url_free (url); |