[epiphany] Move profile directory check to after checking for application mode



commit 5bf71aaa68f405240e43e8365d6ec31df4e216f8
Author: Gustavo Noronha Silva <gns gnome org>
Date:   Sun Jun 9 19:40:01 2013 -0300

    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.

 src/ephy-main.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/ephy-main.c b/src/ephy-main.c
index ac8fc96..96ac40b 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;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]