[epiphany] shell: Fix an incorrect comment
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] shell: Fix an incorrect comment
- Date: Tue, 1 Jan 2019 21:26:41 +0000 (UTC)
commit 4a53bdcc4590fd72718029bbe966e163f9920059
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Tue Jan 1 15:25:23 2019 -0600
shell: Fix an incorrect comment
This comment is flatly incorrect. activate only ever runs in the primary
instance.
src/ephy-shell.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index c6b3c2be2..8684ee63f 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -461,15 +461,13 @@ ephy_shell_activate (GApplication *application)
{
EphyShell *shell = EPHY_SHELL (application);
- /*
- * We get here on each new instance (remote or not). Autoresume the
- * session and queue the commands if we are a secondary instance. Otherwise,
- * execute the commands immediately, before the remote startup context
- * can be invalidated by another remote instance.
- */
if (shell->remote_startup_context == NULL) {
EphySession *session = ephy_shell_get_session (shell);
+ /* We are activating the primary instance for the first time. If we
+ * have a saved session, resume it first, then run any startup
+ * commands in session_load_cb. Otherwise, run them now.
+ */
if (session) {
ephy_session_resume (session,
shell->local_startup_context->user_time,
@@ -477,6 +475,12 @@ ephy_shell_activate (GApplication *application)
} else
ephy_shell_startup_continue (shell, shell->local_startup_context);
} else {
+ /* We are activating the primary instance in response to the launch
+ * of a secondary instance. Execute the commands immediately. We
+ * have to be careful because if we don't handle the commands
+ * immediately, the remote startup context could be invalidated by
+ * the launch of another remote instance.
+ */
ephy_shell_startup_continue (shell, shell->remote_startup_context);
g_clear_pointer (&shell->remote_startup_context, ephy_shell_startup_context_free);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]