From 4c444c0f7693b9a0f3058729bea04832b66d6214 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Wed, 29 Jun 2011 19:55:28 +0200 Subject: Merge EphyApplication into Ephy(Embed)Shell We want to use EphyApplication from embed/ too, so instead of following the EphyEmbedShell/EphyShell pattern just fold the code into the Shell itself. This makes sense since both classes have basically the same function, and we can easily leave the non-embed code in EphyShell and move to EphyEmbedShell the bits we want to be global. The better name would be EphyCoreApplication/EphyApplication for the resulting object, but we can do this later. --- tests/ephy-download.c | 2 +- tests/ephy-embed-single.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/ephy-download.c b/tests/ephy-download.c index ed9144ed7..94445feaf 100644 --- a/tests/ephy-download.c +++ b/tests/ephy-download.c @@ -173,7 +173,7 @@ main (int argc, char *argv[]) ephy_debug_init (); ephy_embed_prefs_init (); - _ephy_shell_create_instance (NULL); + _ephy_shell_create_instance (FALSE); if (!ephy_file_helpers_init (NULL, TRUE, FALSE, NULL)) { g_debug ("Something wrong happened with ephy_file_helpers_init()"); diff --git a/tests/ephy-embed-single.c b/tests/ephy-embed-single.c index 9e15e9ae3..555723c2a 100644 --- a/tests/ephy-embed-single.c +++ b/tests/ephy-embed-single.c @@ -101,7 +101,7 @@ main (int argc, char *argv[]) ephy_debug_init (); ephy_embed_prefs_init (); - _ephy_shell_create_instance (NULL); + _ephy_shell_create_instance (FALSE); if (!ephy_file_helpers_init (NULL, TRUE, FALSE, NULL)) { g_debug ("Something wrong happened with ephy_file_helpers_init()"); -- cgit v1.2.3