nautilus-application: Fix commit 2780ce8790fc575ea

In commit 2780ce8790fc575ea we restored the --new-window option, but at
the same time we were creating a new window for any glib option like
gapplication-service.

Instead of that, check for known application options, and if not found
any, let gapplication manage them.

https://bugzilla.gnome.org/show_bug.cgi?id=738430

1 files changed, 4 insertions, 2 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index d86dc390e..25b2b6762 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -852,10 +852,12 @@ nautilus_application_handle_file_args (NautilusApplication *self,
 			file = g_file_new_for_commandline_arg (remaining[idx]);
 			g_ptr_array_add (file_array, file);
 		}
-	} else if (!self->priv->no_default_window &&
-            !g_variant_dict_contains (options, "select")) {
+	} else if (g_variant_dict_contains (options, "new-window")) {
 		file = g_file_new_for_path (g_get_home_dir ());
 		g_ptr_array_add (file_array, file);
+	} else {
+		/* No options or options that glib already manages */
+		return -1;
 	}
 
 	len = file_array->len;