gnome3-team team mailing list archive

[Jeremy Bicha <jeremy@xxxxxxxxx>]

Jeremy Bicha has proposed merging lp:~jbicha/nautilus/gnome3-fix-autostart into lp:~gnome3-team/nautilus/ubuntu.

Requested reviews:
  GNOME3 Team (gnome3-team)

For more details, see:
https://code.launchpad.net/~jbicha/nautilus/gnome3-fix-autostart/+merge/60691

Patch to fix https://bugzilla.gnome.org/649063 since it looks like we'll be keeping this PPA on Gnome 3.0.* That bug was basically if a user turns on display of desktop icons, many shortcuts to Nautilus don't work.
-- 
https://code.launchpad.net/~jbicha/nautilus/gnome3-fix-autostart/+merge/60691
Your team GNOME3 Team is requested to review the proposed merge of lp:~jbicha/nautilus/gnome3-fix-autostart into lp:~gnome3-team/nautilus/ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-06 17:17:07 +0000
+++ debian/changelog	2011-05-11 20:36:49 +0000
@@ -1,3 +1,11 @@
+nautilus (1:3.0.1.1-0ubuntu1~build3) natty; urgency=low
+
+  * debian/patches/92_fix_nautilus_desktop_autostart.patch
+    - Remove obsolete autostart code so that Nautilus windows
+      can still be opened when desktop icons are shown
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx>  Wed, 11 May 2011 15:04:03 -0400
+
 nautilus (1:3.0.1.1-0ubuntu1~build2) natty; urgency=low
 
   * New upstream release

=== added file 'debian/patches/92_fix_nautilus_desktop_autostart.patch'
--- debian/patches/92_fix_nautilus_desktop_autostart.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/92_fix_nautilus_desktop_autostart.patch	2011-05-11 20:36:49 +0000
@@ -0,0 +1,45 @@
+Description: Remove obsolete autostart code so that Nautilus still shows
+ windows when set to show desktop icons, fixed in Nautilus 3.1.1
+Bug: https://bugzilla.gnome.org/649063
+Origin: http://git.gnome.org/browse/nautilus/commit/?id=31546b509d351e89d8bc0ee23074e8e0ecddbca2
+Author: Cosimo Cecchi <cosimoc@xxxxxxxxx>
+Index: nautilus-3.0.1.1/src/nautilus-application.c
+===================================================================
+--- nautilus-3.0.1.1.orig/src/nautilus-application.c	2011-05-11 14:57:10.982729211 -0400
++++ nautilus-3.0.1.1/src/nautilus-application.c	2011-05-11 14:58:27.804390230 -0400
+@@ -905,8 +905,6 @@
+ 	gboolean no_default_window = FALSE;
+ 	gboolean no_desktop = FALSE;
+ 	gboolean kill_shell = FALSE;
+-	gboolean autostart_mode = FALSE;
+-	const gchar *autostart_id;
+ 	gchar *geometry = NULL;
+ 	gchar **remaining = NULL;
+ 	const GOptionEntry options[] = {
+@@ -941,11 +939,6 @@
+ 
+ 	argv = g_application_command_line_get_arguments (command_line, &argc);
+ 
+-	autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+-	if (autostart_id != NULL && *autostart_id != '\0') {
+-		autostart_mode = TRUE;
+-        }
+-
+ 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ 		g_printerr ("Could not parse arguments: %s\n", error->message);
+ 		g_error_free (error);
+@@ -1004,14 +997,6 @@
+ 		goto out;
+ 	}
+ 
+-	/* If in autostart mode (aka started by gnome-session), we need to ensure 
+-         * nautilus starts with the correct options.
+-         */
+-	if (autostart_mode) {
+-		no_default_window = TRUE;
+-		no_desktop = FALSE;
+-	}
+-
+ 	DEBUG ("Parsing command line, no_default_window %d, quit %d, "
+ 	       "self checks %d, no_desktop %d",
+ 	       no_default_window, kill_shell, perform_self_check, no_desktop);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-02 07:01:10 +0000
+++ debian/patches/series	2011-05-11 20:36:49 +0000
@@ -9,3 +9,4 @@
 83_never_exec_nonexec_launchers.patch
 #89_use_application_indicator.patch
 #91_correct_rgba_use.patch
+92_fix_nautilus_desktop_autostart.patch