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 /tests/ephy-shell-test.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 'tests/ephy-shell-test.c')
-rw-r--r-- | tests/ephy-shell-test.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/ephy-shell-test.c b/tests/ephy-shell-test.c index 1f4a65a22..a0b0c4115 100644 --- a/tests/ephy-shell-test.c +++ b/tests/ephy-shell-test.c @@ -40,6 +40,7 @@ static void test_ephy_shell_basic_embeds (void) { + EphyShell *ephy_shell; GtkWidget *window; EphyEmbed *embed1; @@ -47,6 +48,8 @@ test_ephy_shell_basic_embeds (void) GList *children; + ephy_shell = ephy_shell_get_default (); + /* Both embed and window should be created. */ embed1 = ephy_shell_new_tab_full (ephy_shell, @@ -89,10 +92,12 @@ test_ephy_shell_basic_embeds (void) static void test_ephy_shell_parent_windows (void) { + EphyShell *ephy_shell; GtkWidget *window; GtkWidget *window2; EphyEmbed *embed; + ephy_shell = ephy_shell_get_default (); window = GTK_WIDGET (ephy_window_new ()); /* parent-window provided */ @@ -134,10 +139,12 @@ test_ephy_shell_parent_windows (void) static void test_ephy_shell_tab_load (void) { + EphyShell *ephy_shell; GtkWidget *window; EphyEmbed *embed; EphyWebView *view; + ephy_shell = ephy_shell_get_default (); window = GTK_WIDGET (ephy_window_new ()); /* homepage is "about:blank" for now, see embed/ephy-web-view.c */ @@ -174,6 +181,7 @@ get_notebook_page_num (GtkWidget *notebook, EphyEmbed *embed) static void test_ephy_shell_tab_append (void) { + EphyShell *ephy_shell; GtkWidget *window; GtkWidget *notebook; @@ -183,6 +191,7 @@ test_ephy_shell_tab_append (void) EphyEmbed *embed4; EphyEmbed *embed5; + ephy_shell = ephy_shell_get_default (); window = GTK_WIDGET (ephy_window_new ()); notebook = ephy_window_get_notebook (EPHY_WINDOW (window)); @@ -222,6 +231,7 @@ test_ephy_shell_tab_append (void) static void test_ephy_shell_tab_from_external (void) { + EphyShell *ephy_shell; GtkWidget *window; GtkWidget *notebook; @@ -231,6 +241,7 @@ test_ephy_shell_tab_from_external (void) EphyEmbed *embed4; EphyEmbed *embed5; + ephy_shell = ephy_shell_get_default (); embed = ephy_shell_new_tab (ephy_shell, NULL, NULL, "about:epiphany", EPHY_NEW_TAB_DONT_SHOW_WINDOW | EPHY_NEW_TAB_OPEN_PAGE); window = gtk_widget_get_toplevel (GTK_WIDGET (embed)); @@ -285,6 +296,7 @@ test_ephy_shell_tab_from_external (void) static void test_ephy_shell_tab_no_history (void) { + EphyShell *ephy_shell; GtkWidget *window; EphyEmbed *embed; @@ -297,6 +309,7 @@ test_ephy_shell_tab_no_history (void) WebKitWebBackForwardList *bflist; WebKitWebHistoryItem *item; + ephy_shell = ephy_shell_get_default (); embed = ephy_shell_new_tab (ephy_shell, NULL, NULL, NULL, EPHY_NEW_TAB_DONT_SHOW_WINDOW); window = gtk_widget_get_toplevel (GTK_WIDGET (embed)); @@ -345,7 +358,7 @@ main (int argc, char *argv[]) } _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_TEST); - g_application_register (G_APPLICATION (ephy_shell), NULL, NULL); + g_application_register (G_APPLICATION (ephy_shell_get_default ()), NULL, NULL); g_test_add_func ("/src/ephy-shell/basic_embeds", test_ephy_shell_basic_embeds); @@ -367,7 +380,7 @@ main (int argc, char *argv[]) ret = g_test_run (); - g_object_unref (ephy_shell); + g_object_unref (ephy_shell_get_default ()); ephy_file_helpers_shutdown (); return ret; |