[gnome-software/gnome-3-30] Revert "trivial: Allow the application to change modes using activation"



commit ca5f8e74b6f9991ae228caa2c698131a54764774
Author: Robert McQueen <rob endlessm com>
Date:   Thu Oct 11 12:00:54 2018 +0100

    Revert "trivial: Allow the application to change modes using activation"
    
    This reverts commit ef15f51d as it caused a regression with the shell appearing
    in an undefined state when the window was reloaded. This function is only
    called in the default activation case, not the --mode=... or other specific
    GActions. These already correctly set their modes, so this one should always
    set overview if the initial loading is completed.

 src/gs-application.c | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/src/gs-application.c b/src/gs-application.c
index a19fd261..8557e1ff 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -949,6 +949,11 @@ gs_application_startup (GApplication *application)
 static void
 gs_application_activate (GApplication *application)
 {
+       GsApplication *app = GS_APPLICATION (application);
+
+       if (app->shell_loaded_handler_id == 0)
+               gs_shell_set_mode (app->shell, GS_SHELL_MODE_OVERVIEW);
+
        gs_shell_activate (GS_APPLICATION (application)->shell);
 
        gs_application_show_first_run_dialog (GS_APPLICATION (application));


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