[nautilus/gnome-3-6] application: don't open the default display when parsing options

[Cosimo Cecchi <cosimoc src gnome org>]

commit 629c9bc27ae8f43df35943e25e78c0d5bd39cfae
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Sep 28 17:25:57 2012 -0400

    application: don't open the default display when parsing options
    
    Opening the default display when parsing options means we'll do it in
    non-primary instances of the application.
    When the default display is opened, _gdk_x11_display_make_default() will
    be called, which reads and removed DESKTOP_STARTUP_ID from the
    environment - but we need to keep DESKTOP_STARTUP_ID around until
    add_platform_data() is called in the non-primary instance, which takes
    care of forwarding it to the primary instance.
    
    This fixes the busy spinning cursor being stuck when opening multiple
    Nautilus windows.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=664147

 src/nautilus-application.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index b165ca8..cda9854 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1092,7 +1092,7 @@ nautilus_application_local_command_line (GApplication *application,
 
 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
 	g_option_context_add_main_entries (context, options, NULL);
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+	g_option_context_add_group (context, gtk_get_option_group (FALSE));
 
 	argv = *arguments;
 	argc = g_strv_length (argv);