diff options
| author | Carlos Soriano <carlos.sorian89@gmail.com> | 2014-12-05 17:57:19 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2014-12-06 15:08:38 -0800 |
| commit | 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 (patch) | |
| tree | 0bb840c9db306ce286e8a6748c81fd5b96bee071 | |
| parent | 55cc9c8103628843c9810a4d073659e6584e0328 (diff) | |
| download | nautilus-845e8dbe02a3609b3d7df41dd0df38f8bbad3682.tar.gz | |
nautilus-application: Parse force-desktop before exiting
In commit ae4d4960 we introduced a regression that a new window was
openned if both --no-default-window and --force-desktop options were
used.
To avoid that, activate those options before actually skipping the
activate of the application if --no-default-window option is provided.
The application nornally would exit if --no-default-window is provided
and the show-desktop-window is not activated, but, we rely on a the
detail that activating the open-desktop action when --force-desktop is
provided as a option, creates a new window, which makes the application
keep alive.
https://bugzilla.gnome.org/show_bug.cgi?id=741166
| -rw-r--r-- | src/nautilus-application.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index f26c8c7a3..c336a3909 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application, self->priv->desktop_override = TRUE; g_action_group_activate_action (G_ACTION_GROUP (application), "close-desktop", NULL); - } else if (g_variant_dict_contains (options, "no-default-window")) { + } + + if (g_variant_dict_contains (options, "no-default-window")) { /* We want to avoid trigering the activate signal; so no window is created. * GApplication doesn't call activate if we return a value >= 0. * Use EXIT_SUCCESS since is >= 0. */ |