diff options
| author | Chow Loong Jin <hyperair@debian.org> | 2015-06-08 04:55:50 +0800 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-06-09 11:27:58 +0200 |
| commit | bfe878e4313e21b4c539d95a88d243065d30fc2c (patch) | |
| tree | 90a4ab2dd793dbe4b25f5b3a042d4bf11e97a537 | |
| parent | fed56bda0188fcd50d93f4504e5a7fd3c283a539 (diff) | |
| download | nautilus-bfe878e4313e21b4c539d95a88d243065d30fc2c.tar.gz | |
application: Ignore --no-desktop if not first launch
--no-desktop is an option to allow for running Nautilus under other desktop
environments as well as GNOME without clobbering the foreign desktop
environment's desktop.
https://bugzilla.gnome.org/show_bug.cgi?id=750528
Signed-off-by: Chow Loong Jin <hyperair@debian.org>
| -rw-r--r-- | src/nautilus-application.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index f5e32b0d6..bde2330d9 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -826,10 +826,14 @@ nautilus_application_command_line (GApplication *application, g_action_group_activate_action (G_ACTION_GROUP (application), "open-desktop", NULL); } else if (g_variant_dict_contains (options, "no-desktop")) { - DEBUG ("Forcing desktop off, as requested"); - self->priv->desktop_override = TRUE; - g_action_group_activate_action (G_ACTION_GROUP (application), - "close-desktop", NULL); + if (g_application_get_is_remote (application)) { + DEBUG ("Not primary instance. Ignoring --no-desktop."); + } else { + DEBUG ("Forcing desktop off, as requested"); + self->priv->desktop_override = TRUE; + g_action_group_activate_action (G_ACTION_GROUP (application), + "close-desktop", NULL); + } } if (g_variant_dict_contains (options, "no-default-window")) { |