Fix nautilus window closing when doing DnD from file-roller, bug 290001

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 214 insertions, 12 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index b2fa5254919c..ae951c2f0a74 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.329 2009/12/17 23:26:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.330 2009/12/30 00:11:41 nirbheek Exp $
+
+*nautilus-2.26.4-r1 (30 Dec 2009)
+
+  30 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +nautilus-2.26.4-r1.ebuild,
+  +files/nautilus-2.26.4-file-roller-drag-n-drop.patch:
+  Fix nautilus window closing when doing DnD from file-roller, bug 290001
 
 *nautilus-2.28.4 (17 Dec 2009)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5bedd5a79b93..d3c67105b7ef 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nautilus-2.24.2-filechooser-icon.patch 1630 RMD160 8f7fc892670a5b85f0a176bff89199c5a09e1a69 SHA1 defb885cbe8ba014d8787a08b3c703ed54ee829b SHA256 e86ac2512ae66ba3b4ec285f0a88b58387e64d3490c4172f03fd846881ebcb2f
 AUX nautilus-2.24.2-playlist-preview.patch 1036 RMD160 16e9a0239f1f162cb9683cf08f0d9e1b2c46230f SHA1 31ddf4cb3a1eb940aebedbbed9b4822759d361f5 SHA256 cddf52194fc6ae542dbb58b047fd5b65f20eb874f0468ec448b35ec0a6bd498a
 AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
 AUX nautilus-2.24.2-thumbnail-scaling.patch 2597 RMD160 b82748147f709118b060224a0458f16f74d7ddd9 SHA1 eb22ebc617d615832c943f2b24811ae08cb88304 SHA256 7948ae9ef56bf8c6e9d296ba741472fe8ad6faae8adb8f98e96b4002c3302f42
 AUX nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch 1421 RMD160 e4d745be6f938f5390fba74db0645534f60d9207 SHA1 21906f957df5b2f93ab6b34223405dd5f594b12e SHA256 687040243006b5698ec062305cb26bf5cd80c9ce1b8bc67f3025af134d3a242a
 AUX nautilus-2.26.3-thumbnail-zoom-level.patch 3411 RMD160 296a997116f96100d067c6dfd7a6e936c2946d90 SHA1 e2477c779e182f6609e08167ceafab54d081fd79 SHA256 400d809f16d0dd470ea287cd288ed378c2afcbf45ead48639d7b5b1b0a71828c
+AUX nautilus-2.26.4-file-roller-drag-n-drop.patch 2746 RMD160 0c2d7bc4627c840a167db6b3f852c7d19996647d SHA1 9bcb0b677714c924b3c31b6d22c7581dd7fac4a5 SHA256 b107464ef573c7d1036eb10562b5d62faf015d8ced9fb335d4639fdcb8c93b33
 AUX nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch 1396 RMD160 7efbc47c5f4ac647a15a56a26f80898e8ec896d0 SHA1 24f5281406066fc7fd5ffda23a061144c3667fe1 SHA256 ae9f91dddbbe2d562f5f21786daec6468b8788ece48419cce438d13201eef251
 DIST nautilus-2.24.2.tar.bz2 5356516 RMD160 a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef SHA1 9bc2cf110ae50d69633095aa8115cf89c095ef42 SHA256 a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
 DIST nautilus-2.26.4.tar.bz2 5815912 RMD160 4af723021ece1fb9a37bd3bcc2de903b6c7dca61 SHA1 7eab587e0b88e3eab8196f64596207a1dc1c4b33 SHA256 63dc4f76925f73bf17aafcffbac87f272ac2a13fb098c8ddf5bd70cd80a6ab58
@@ -14,16 +12,10 @@ DIST nautilus-2.28.1.tar.bz2 6020681 RMD160 c3e3b22783d992aa8eb983525dfc23f0d421
 DIST nautilus-2.28.2.tar.bz2 6043915 RMD160 ae0093b7fd536548beef40a60b3a5c34c460f8ae SHA1 cc1e0e80df8ee38c8e787e7b7249c0fbc8ba3808 SHA256 6e4ff8d1533e0786721f9d4958d4f78c5c89ac7e8fff00b3989895c00cf2cffe
 DIST nautilus-2.28.4.tar.bz2 6045403 RMD160 8960342fa3a6f976e283f338c060896d67a4c028 SHA1 f6db915e725e6f45cd2d3f933eb251499dccf038 SHA256 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87
 EBUILD nautilus-2.24.2-r3.ebuild 2241 RMD160 b4fa3199a4bcbca28797ee48f3569c611efdede0 SHA1 07684219e272048a2269c4c83ca94f2db7781b1b SHA256 d884cc9ba3f161b4f430b13d1b7cc54888d7a24fd3d73118b5ea95dfea4f9285
+EBUILD nautilus-2.26.4-r1.ebuild 2851 RMD160 5aa183ccc4ee3bcb0d89bb317a9ed90069f815ba SHA1 c68e609982ffee1227372db59ac921d3180e4375 SHA256 df38e2c1d3045683c45a965336c431db64fd39e9b434d6d5a9e0f60545ab2b3e
 EBUILD nautilus-2.26.4.ebuild 2704 RMD160 065e8b3314139a26397752e29b154a691f550238 SHA1 774df7d4db4d9bd4a369e1188461eccb7796658f SHA256 6b2b8473e6fb6d25d6de2b00ad7a189543cdff8eae87ba2bb15f6d0d5480de9b
 EBUILD nautilus-2.28.1.ebuild 2693 RMD160 be87cc6ad315e776951b2f430ebebad50a76f781 SHA1 73797f00dc3da48ddd2fcfde7d5ffe8b0921d265 SHA256 36613b6cab032b8c5b1be3901243b6905294a8ae1c953f1b97130d7e555efe74
 EBUILD nautilus-2.28.2.ebuild 2685 RMD160 dd2e2ee8f57d347bcc08c56f993abd35a20282b3 SHA1 2d52a0517e8e120f6cced02a65bf3dd602efd915 SHA256 b3355ede9f5cff4763693be1695104fb64490457b555e574109e997187f39abc
 EBUILD nautilus-2.28.4.ebuild 2710 RMD160 72949cc02149278fa6e611332b79ef8bdc73c32f SHA1 1680c835288b7ef33ea00c92ca9c73aa7fcf241d SHA256 e8c375c98feaa8df54987286a5b360ff5a6c3d14e50579e86aa243428577808b
-MISC ChangeLog 47704 RMD160 5af50e8b794a82da15c43491d0e54fa097c01e06 SHA1 dd5565866e51b0cd7d62cba27dc19141c0abd7a6 SHA256 be9fa55fd14e58275a1dfff7ac420ca3cfc5361a55d6820545e261e4795cb630
+MISC ChangeLog 47959 RMD160 fee145cab7b31f6632964d192262666c78ebaa75 SHA1 3fd540a73b4fe3369d268b6bcc13dfc10f81869a SHA256 f8ff9013ed8a386c4a7e464625ffd5f425db73c242219644358857bbc5db7565
 MISC metadata.xml 473 RMD160 d06a14b541ddb9774c9d81895146a14557c196fd SHA1 99497b8bede2582b76a802d7c3f75adbad6fc9a0 SHA256 8e0fbacc02474a585de7d90b28041754ae260c032ef32952ed5da3e0cc377dfc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksqvjAACgkQ1fmVwcYIWAYuywCeORlvekSCmCj4kCXVADpj3wMo
-G8YAn3gA22yD/7qrXer+sGBInxpTpgpd
-=+VKI
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch b/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch
new file mode 100644
index 000000000000..28d637ca5181
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.26.4-file-roller-drag-n-drop.patch
@@ -0,0 +1,103 @@
+Fixes nautilus window closing when doing DnD from file-roller.
+Patch is taken from upstream git
+
+http://bugs.gentoo.org/show_bug.cgi?id=290001
+
+---
+From 23278532505862816bd5c8c0ab7d17f7a07b4790 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Fri, 09 Oct 2009 17:19:42 +0000
+Subject: Always check if the drag dest supports the source.
+
+In the "drag-motion" callback, make sure we check for target != GDK_NONE
+before getting non-existent data for it.
+---
+diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
+index b7e1df2..15b6395 100644
+--- a/libnautilus-private/nautilus-dnd.c
++++ b/libnautilus-private/nautilus-dnd.c
+@@ -1010,7 +1010,7 @@ nautilus_drag_selection_includes_special_link (GList *selection_list)
+ 	return FALSE;
+ }
+ 
+-static void
++static gboolean
+ slot_proxy_drag_motion (GtkWidget          *widget,
+ 			GdkDragContext     *context,
+ 			int                 x,
+@@ -1038,6 +1038,11 @@ slot_proxy_drag_motion (GtkWidget          *widget,
+ 
+ 	if (!drag_info->have_data) {
+ 		target = gtk_drag_dest_find_target (widget, context, NULL);
++
++		if (target == GDK_NONE) {
++			goto out;
++		}
++
+ 		gtk_drag_get_data (widget, context, target, time);
+ 	}
+ 
+@@ -1079,6 +1084,8 @@ out:
+ 	}
+ 
+ 	gdk_drag_status (context, action, time);
++
++	return TRUE;
+ }
+ 
+ static void
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 1d07bba..9a87322 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -850,7 +850,7 @@ compute_drop_position (GtkTreeView *tree_view,
+ }
+ 
+ 
+-static void
++static gboolean
+ get_drag_data (GtkTreeView *tree_view,
+ 	       GdkDragContext *context, 
+ 	       unsigned int time)
+@@ -861,8 +861,14 @@ get_drag_data (GtkTreeView *tree_view,
+ 					    context, 
+ 					    NULL);
+ 
++	if (target == GDK_NONE) {
++		return FALSE;
++	}
++
+ 	gtk_drag_get_data (GTK_WIDGET (tree_view),
+ 			   context, target, time);
++
++	return TRUE;
+ }
+ 
+ static void
+@@ -928,7 +934,9 @@ drag_motion_callback (GtkTreeView *tree_view,
+ 	char *uri;
+ 
+ 	if (!sidebar->drag_data_received) {
+-		get_drag_data (tree_view, context, time);
++		if (!get_drag_data (tree_view, context, time)) {
++			return FALSE;
++		}
+ 	}
+ 
+ 	compute_drop_position (tree_view, x, y, &path, &pos, sidebar);
+@@ -1269,10 +1277,11 @@ drag_drop_callback (GtkTreeView *tree_view,
+ 		    unsigned int time,
+ 		    NautilusPlacesSidebar *sidebar)
+ {
++	gboolean retval = FALSE;
+ 	sidebar->drop_occured = TRUE;
+-	get_drag_data (tree_view, context, time);
++	retval = get_drag_data (tree_view, context, time);
+ 	g_signal_stop_emission_by_name (tree_view, "drag-drop");
+-	return TRUE;
++	return retval;
+ }
+ 
+ /* Callback used when the file list's popup menu is detached */
+--
+cgit v0.8.2
diff --git a/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild
new file mode 100644
index 000000000000..e8d8843823f5
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.26.4-r1.ebuild
@@ -0,0 +1,100 @@
+# 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.4-r1.ebuild,v 1.1 2009/12/30 00:11:41 nirbheek Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle doc gnome tracker xmp"
+
+# not adding gnome-base/gail because it is in gtk+
+RDEPEND=">=dev-libs/glib-2.19.0
+	>=gnome-base/gnome-desktop-2.25.5
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.16.0
+	>=dev-libs/libxml2-2.4.7
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2.0
+	>=gnome-base/gvfs-0.1.2
+	dev-libs/libunique
+	dev-libs/dbus-glib
+	x11-libs/libXft
+	x11-libs/libXrender
+	beagle? ( || (
+		dev-libs/libbeagle
+		=app-misc/beagle-0.2* ) )
+	tracker? ( >=app-misc/tracker-0.6.4 )
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-packagekit
+		$(use_enable beagle)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	# gtk-doc-am and gnome-common needed for this
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# Fix nautilus flipping-out with --no-desktop -- bug 266398
+	epatch "${FILESDIR}/${PN}-2.26.2-change-reg-desktop-file-with-no-desktop.patch"
+
+	# Fix massive memory consumption by Nautilus for larger zoom levels.
+	# Import from upstream, see distributor mailing lists.
+	epatch "${FILESDIR}/${PN}-2.26.3-thumbnail-zoom-level.patch"
+
+	# Fix nautilus window closing when doing DnD from file-roller, bug 290001
+	epatch "${FILESDIR}/${P}-file-roller-drag-n-drop.patch"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}