Add patch to prevent nautilus from flipping out when not managing the desktop. Fixes bug 266398

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 45 insertions, 2 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index df88c9133431..f387fb4f8352 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.307 2009/05/11 17:29:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.308 2009/05/14 11:15:29 nirbheek Exp $
+
+*nautilus-2.26.2-r1 (14 May 2009)
+
+  14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -nautilus-2.26.2.ebuild, +nautilus-2.26.2-r1.ebuild,
+  +files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch:
+  Add patch to prevent nautilus from flipping out when not managing the
+  desktop. Fixes bug 266398
 
   11 May 2009; Brent Baude <ranger@gentoo.org> nautilus-2.24.2-r3.ebuild:
   stable ppc64, bug 269186
diff --git a/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
new file mode 100644
index 000000000000..d6ca6eb97227
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
@@ -0,0 +1,33 @@
+Gentoo bug 266398
+GNOME #580793 and #571417
+
+Index: nautilus-2.26.2/src/nautilus-main.c
+===================================================================
+--- nautilus-2.26.2.orig/src/nautilus-main.c	2009-04-29 17:02:32.709364982 +0200
++++ nautilus-2.26.2/src/nautilus-main.c	2009-04-29 17:39:36.529860872 +0200
+@@ -391,9 +391,6 @@ main (int argc, char *argv[])
+ 	browser_window = FALSE;
+ 
+ 	g_set_prgname ("nautilus");
+-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+-		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+-	}
+ 
+ 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
+ 	g_option_context_add_main_entries (context, options, NULL);
+@@ -464,6 +461,15 @@ main (int argc, char *argv[])
+ 			(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
+ 	}
+ 
++	/* Which .desktop file contains the relevant session management
++	   information? */
++	if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
++	    && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
++		egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
++	} else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
++		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
++	}
++
+ 	application = NULL;
+ 
+ 	/* Do either the self-check or the real work. */
diff --git a/gnome-base/nautilus/nautilus-2.26.2.ebuild b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
index b72c02ef3c55..dfafc81ba11a 100644
--- a/gnome-base/nautilus/nautilus-2.26.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2.ebuild,v 1.1 2009/05/10 20:49:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild,v 1.1 2009/05/14 11:15:29 nirbheek Exp $
 
 EAPI="2"
 
@@ -71,6 +71,8 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-change-reg-desktop-file-with-no-desktop.patch"
 }
 
 src_test() {