Bump to 2.24.2-r2. Thanks to Pacho Ramos,

 * Fix preview on playlists, bug #263162
 * Fix non asyncness in custom icon filechooser, bug #263165
(Portage version: 2.2_rc25/cvs/Linux x86_64)

4 files changed, 202 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index bf51d6a72e65..9d79ab4cf5ae 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,15 @@
 # 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.299 2009/03/18 15:02:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.300 2009/03/21 12:59:21 eva Exp $
+
+*nautilus-2.24.2-r2 (21 Mar 2009)
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.24.2-filechooser-icon.patch,
+  +files/nautilus-2.24.2-playlist-preview.patch, +nautilus-2.24.2-r2.ebuild:
+  Bump to 2.24.2-r2. Thanks to Pacho Ramos,
+   * Fix preview on playlists, bug #263162
+   * Fix non asyncness in custom icon filechooser, bug #263165
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> nautilus-2.24.2.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch b/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch
new file mode 100644
index 000000000000..a2fcb5aa42c0
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch
@@ -0,0 +1,72 @@
+# https://bugzilla.gnome.org/show_bug.cgi?id=575344
+# https://bugs.gentoo.org/show_bug.cgi?id=263165
+--- a/src/file-manager/fm-properties-window.c	2009/03/08 00:33:28	15067
++++ b/src/file-manager/fm-properties-window.c	2009/03/20 14:35:04	15145
+@@ -5677,6 +5677,31 @@
+ }
+ 
+ static void
++custom_icon_file_chooser_response_cb (GtkDialog *dialog,
++				      gint response,
++				      FMPropertiesWindow *window)
++{
++	char *uri;
++
++	switch (response) {
++	case GTK_RESPONSE_NO:
++		reset_icon (window);
++		break;
++
++	case GTK_RESPONSE_OK:
++		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
++		set_icon (uri, window);
++		g_free (uri);
++		break;
++
++	default:
++		break;
++	}
++
++	gtk_widget_hide (GTK_WIDGET (dialog));
++}
++
++static void
+ select_image_button_callback (GtkWidget *widget,
+ 			      FMPropertiesWindow *window)
+ {
+@@ -5684,8 +5709,8 @@
+ 	GtkFileFilter *filter;
+ 	GList *l;
+ 	NautilusFile *file;
+-	char *image_path;
+ 	char *uri;
++	char *image_path;
+ 	gboolean revert_is_sensitive;
+ 
+ 	g_assert (FM_IS_PROPERTIES_WINDOW (window));
+@@ -5751,22 +5776,9 @@
+ 	}
+ 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_NO, revert_is_sensitive);
+ 
+-	switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
+-	case GTK_RESPONSE_NO:
+-		reset_icon (window);
+-		break;
+-
+-	case GTK_RESPONSE_OK:
+-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+-		set_icon (uri, window);
+-		g_free (uri);
+-		break;
+-
+-	default:
+-		break;
+-	}
+-
+-	gtk_widget_hide (dialog);
++	g_signal_connect (dialog, "response",
++			  G_CALLBACK (custom_icon_file_chooser_response_cb), window);
++	gtk_widget_show (dialog);
+ }
+ 
+ static void
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch b/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch
new file mode 100644
index 000000000000..489604966c84
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch
@@ -0,0 +1,41 @@
+# https://bugzilla.gnome.org/show_bug.cgi?id=575345
+# https://bugs.gentoo.org/show_bug.cgi?id=263162
+--- a/src/file-manager/nautilus-audio-mime-types.h	(revision 15140)
++++ b/src/file-manager/nautilus-audio-mime-types.h	(working copy)
+@@ -1,6 +1,6 @@
+ /* generated with mime-types-include.sh in the totem module, don't edit or 
+    commit in the nautilus module without filing a bug against totem */
+-static char *audio_mime_types[] = {
++static const char *audio_mime_types[] = {
+ "audio/3gpp",
+ "audio/ac3",
+ "audio/AMR",
+@@ -9,18 +9,18 @@
+ "audio/midi",
+ "audio/mp4",
+ "audio/mpeg",
+-"audio/mpegurl",
+ "audio/ogg",
++"audio/prs.sid",
+ "audio/vnd.rn-realaudio",
+ "audio/x-ape",
+ "audio/x-flac",
++"audio/x-gsm",
+ "audio/x-it",
+ "audio/x-m4a",
+ "audio/x-matroska",
+ "audio/x-mod",
+ "audio/x-mp3",
+ "audio/x-mpeg",
+-"audio/x-mpegurl",
+ "audio/x-ms-asf",
+ "audio/x-ms-asx",
+ "audio/x-ms-wax",
+@@ -33,7 +33,6 @@
+ "audio/x-realaudio",
+ "audio/x-real-audio",
+ "audio/x-sbc",
+-"audio/x-scpls",
+ "audio/x-speex",
+ "audio/x-tta",
+ "audio/x-wav",
diff --git a/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild b/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild
new file mode 100644
index 000000000000..de25fd7cd47d
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.24.2-r2.ebuild
@@ -0,0 +1,79 @@
+# 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.24.2-r2.ebuild,v 1.1 2009/03/21 12:59:21 eva 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"
+
+RDEPEND=">=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.24.0
+	>=dev-libs/glib-2.17.5
+	>=gnome-base/gnome-desktop-2.10
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.13.0
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2.0
+	>=gnome-base/gvfs-0.1.2
+	beagle? ( || (
+		dev-libs/libbeagle
+		=app-misc/beagle-0.2* ) )
+	tracker? ( >=app-misc/tracker-0.6.4 )
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+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
+		$(use_enable beagle)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+}
+
+src_prepare() {
+	# Fix update of scrollbars, bug #260965
+	epatch "${FILESDIR}/${P}-scrollbars.patch"
+
+	# Fix preview on playlists, bug #263162
+	epatch "${FILESDIR}/${P}-playlist-preview.patch"
+
+	# Fix non asyncness in custom icon filechooser, bug #263165
+	epatch "${FILESDIR}/${P}-filechooser-icon.patch"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	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"
+}