aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Noronha Silva <gns@gnome.org>2013-06-10 06:40:01 +0800
committerGustavo Noronha Silva <gns@gnome.org>2013-06-10 06:45:48 +0800
commit5bf71aaa68f405240e43e8365d6ec31df4e216f8 (patch)
treece938502d2ca8be1a484e9702eff0dd64c039c38
parentc2fbc7f80a13c6aac0ee998050eb78dae3f5ff0f (diff)
downloadgsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar.gz
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar.bz2
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar.lz
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar.xz
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.tar.zst
gsoc2013-epiphany-5bf71aaa68f405240e43e8365d6ec31df4e216f8.zip
Move profile directory check to after checking for application mode
Since application mode also has a profile directory, we will enter the non-app-mode profile shell mode instead.
-rw-r--r--src/ephy-main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index ac8fc96c5..96ac40b31 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -428,13 +428,7 @@ main (int argc,
/* Now create the shell */
if (private_instance)
mode = EPHY_EMBED_SHELL_MODE_PRIVATE;
- else if (profile_directory) {
- /* This mode exists purely for letting EphyShell know it should
- * not consider this instance part of the unique application
- * represented by the BROWSER mode.
- */
- mode = EPHY_EMBED_SHELL_MODE_STANDALONE;
- } else if (incognito_mode) {
+ else if (incognito_mode) {
mode = EPHY_EMBED_SHELL_MODE_INCOGNITO;
/* Use the right theming. */
@@ -465,6 +459,12 @@ main (int argc,
}
g_free (app_icon);
+ } else if (profile_directory) {
+ /* This mode exists purely for letting EphyShell know it should
+ * not consider this instance part of the unique application
+ * represented by the BROWSER mode.
+ */
+ mode = EPHY_EMBED_SHELL_MODE_STANDALONE;
} else {
mode = EPHY_EMBED_SHELL_MODE_BROWSER;