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/bookmarks/ephy-bookmarks-editor.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/bookmarks/ephy-bookmarks-editor.c')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 0cd9e1274..19151c195 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -290,7 +290,7 @@ get_target_window (EphyBookmarksEditor *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 ()))); } } @@ -314,7 +314,8 @@ cmd_open_bookmarks_in_tabs (GtkAction *action, location = ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_LOCATION); - new_embed = ephy_shell_new_tab (ephy_shell, window, NULL, location, + new_embed = ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, location, EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_EXISTING_WINDOW); /* if there was no target window, a new one was opened. Get it @@ -350,8 +351,10 @@ cmd_open_bookmarks_in_browser (GtkAction *action, location = ephy_node_get_property_string (node, EPHY_NODE_BMK_PROP_LOCATION); - ephy_shell_new_tab (ephy_shell, window, NULL, location, - EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_NEW_WINDOW); + ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, location, + EPHY_NEW_TAB_OPEN_PAGE | + EPHY_NEW_TAB_IN_NEW_WINDOW); } g_list_free (selection); @@ -1043,7 +1046,8 @@ ephy_bookmarks_editor_node_activated_cb (GtkWidget *view, (node, EPHY_NODE_BMK_PROP_LOCATION); g_return_if_fail (location != NULL); - ephy_shell_new_tab (ephy_shell, NULL, NULL, location, + ephy_shell_new_tab (ephy_shell_get_default (), + NULL, NULL, location, EPHY_NEW_TAB_OPEN_PAGE); } @@ -1061,7 +1065,8 @@ ephy_bookmarks_editor_node_middle_clicked_cb (GtkWidget *view, (node, EPHY_NODE_BMK_PROP_LOCATION); g_return_if_fail (location != NULL); - ephy_shell_new_tab (ephy_shell, window, NULL, location, + ephy_shell_new_tab (ephy_shell_get_default (), + window, NULL, location, EPHY_NEW_TAB_OPEN_PAGE | EPHY_NEW_TAB_IN_EXISTING_WINDOW); } |