ephy-shell: remove the ephy_shell global

https://bugzilla.gnome.org/show_bug.cgi?id=683614

5 files changed, 16 insertions, 11 deletions

diff --git a/src/bookmarks/ephy-bookmark-action-group.c b/src/bookmarks/ephy-bookmark-action-group.c
index 3a6820015..f2c55cbc1 100644
--- a/src/bookmarks/ephy-bookmark-action-group.c
+++ b/src/bookmarks/ephy-bookmark-action-group.c
@@ -140,7 +140,7 @@ ephy_bookmark_group_new (EphyNode *node)
 	GtkActionGroup *action_group;
 	guint i;
 	
-	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 	smart = ephy_bookmarks_get_smart_bookmarks (bookmarks);
 
 	action_group = (GtkActionGroup *) ephy_link_action_group_new ("BA");
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 0e832c5e1..639d780d0 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -319,7 +319,7 @@ void
 ephy_bookmark_action_updated (EphyBookmarkAction *action)
 {
 	GValue value = { 0, };
-	EphyBookmarks *bookmarks = ephy_shell_get_bookmarks (ephy_shell);
+	EphyBookmarks *bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 	EphyNode *smart = ephy_bookmarks_get_smart_bookmarks (bookmarks);
 	EphyNode *node = action->priv->node;
 	const char *title;
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);
 }
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index f22cdbe21..dd3bf990f 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -199,7 +199,7 @@ ephy_bookmarks_menu_build (GString *string, EphyNode *parent)
 	gint priority;
 	guint flags, id, i;
 	
-	eb = ephy_shell_get_bookmarks (ephy_shell);
+	eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 
 	children = ephy_node_get_children (ephy_bookmarks_get_keywords (eb));        
 	topics = g_ptr_array_sized_new (children->len);
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index 02c264dd9..4e41638f2 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -169,7 +169,7 @@ ephy_bookmarks_ui_attach_window (EphyWindow *window)
 	GtkActionGroup *actions;
 	GtkAction *action;
 
-	eb = ephy_shell_get_bookmarks (ephy_shell);
+	eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 	bookmarks = ephy_bookmarks_get_bookmarks (eb);
 	topics = ephy_bookmarks_get_keywords (eb);
 	data = g_object_get_data (G_OBJECT (window), BM_WINDOW_DATA_KEY);
@@ -238,7 +238,7 @@ ephy_bookmarks_ui_attach_window (EphyWindow *window)
 void
 ephy_bookmarks_ui_detach_window (EphyWindow *window)
 {
-	EphyBookmarks *eb = ephy_shell_get_bookmarks (ephy_shell);
+	EphyBookmarks *eb = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 	EphyNode *bookmarks = ephy_bookmarks_get_bookmarks (eb);
 	EphyNode *topics = ephy_bookmarks_get_keywords (eb);