[epiphany/mcatanzaro/#724] Fix too many actions disabled in incognito/automation mode



commit 253295c67328cb4ec195b9ba2b5aecd98272cb45
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Apr 18 15:32:56 2019 -0500

    Fix too many actions disabled in incognito/automation mode
    
    These are only supposed to be disabled in app mode. Too many braces here
    is resulting in slightly confusing code.
    
    Fixes #724

 src/ephy-shell.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index b4b7fe246..8aeeff469 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -377,16 +377,16 @@ ephy_shell_startup (GApplication *application)
         /* Create the sync service. */
         ephy_shell_get_sync_service (shell);
       }
-
-      /* Actions that are disabled in app mode */
-      set_accel_for_action (shell, "app.new-window", "<Primary>n");
-      set_accel_for_action (shell, "app.new-incognito", "<Primary><Shift>n");
-      set_accel_for_action (shell, "app.reopen-closed-tab", "<Primary><Shift>t");
-      set_accel_for_action (shell, "app.import-bookmarks", "<Primary><Shift>m");
-      set_accel_for_action (shell, "app.export-bookmarks", "<Primary><Shift>x");
-      set_accel_for_action (shell, "app.shortcuts", "<Primary>F1");
-      set_accel_for_action (shell, "app.help", "F1");
     }
+
+    /* Actions that are disabled in app mode */
+    set_accel_for_action (shell, "app.new-window", "<Primary>n");
+    set_accel_for_action (shell, "app.new-incognito", "<Primary><Shift>n");
+    set_accel_for_action (shell, "app.reopen-closed-tab", "<Primary><Shift>t");
+    set_accel_for_action (shell, "app.import-bookmarks", "<Primary><Shift>m");
+    set_accel_for_action (shell, "app.export-bookmarks", "<Primary><Shift>x");
+    set_accel_for_action (shell, "app.shortcuts", "<Primary>F1");
+    set_accel_for_action (shell, "app.help", "F1");
   } else {
     g_action_map_add_action_entries (G_ACTION_MAP (application),
                                      app_mode_app_entries, G_N_ELEMENTS (app_mode_app_entries),


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