[gnome-shell/T27795: 9/138] Revert "shell-app: Don't transition to STOPPED while still in the STARTING state"
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/T27795: 9/138] Revert "shell-app: Don't transition to STOPPED while still in the STARTING state"
- Date: Tue, 1 Oct 2019 23:30:05 +0000 (UTC)
commit 168d166cf1f7de2281f533f30b99c836ba53e88e
Author: Mario Sanchez Prada <mario endlessm com>
Date: Wed Oct 18 17:16:08 2017 +0100
Revert "shell-app: Don't transition to STOPPED while still in the STARTING state"
It turns out that this fix broke our eos-google-chrome-helper mechanism (T19684):
It will cause the Chrome fake "app" (the one that opens the App Center when Chrome
is not installed) to be permanently moved to the STARTING state after running it
once, causing the speedwagon to never go away until hitting the timeout if you
choose not to install it when the App Center opens.
Since the problem with Speedwagon this ticket was supposed to fix is not strictly
speaking a regression (it's been there for a while), we're temporarily reverting
this patch so that Chrome is not broken at least.
This reverts commit 3c27b824053ec4bc55fdd155365c801abeb1b4ff.
https://phabricator.endlessm.com/T19424
https://phabricator.endlessm.com/T19684
src/shell-app.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/shell-app.c b/src/shell-app.c
index 33d5ec3a7a..2091e2602c 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -1112,10 +1112,16 @@ _shell_app_remove_window (ShellApp *app,
if (!meta_window_is_skip_taskbar (window))
app->running_state->interesting_windows--;
- shell_app_sync_running_state (app);
if (app->running_state->windows == NULL)
- g_clear_pointer (&app->running_state, unref_running_state);
+ {
+ g_clear_pointer (&app->running_state, unref_running_state);
+ shell_app_state_transition (app, SHELL_APP_STATE_STOPPED);
+ }
+ else
+ {
+ shell_app_sync_running_state (app);
+ }
g_signal_emit (app, shell_app_signals[WINDOWS_CHANGED], 0);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]