[gentoo-commits] gentoo-x86 commit in gnome-base/nautilus/files: nautilus-2.24.2-filechooser-icon.patch nautilus-2.24.2-playlist-preview.patch

[Gilles Dartiguelongue (eva)]

eva         09/03/21 12:59:20

  Added:                nautilus-2.24.2-filechooser-icon.patch
                        nautilus-2.24.2-playlist-preview.patch
  Log:
  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)

Revision  Changes    Path
1.1                  gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.24.2-filechooser-icon.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.24.2-filechooser-icon.patch
===================================================================
# 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



1.1                  gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.24.2-playlist-preview.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.24.2-playlist-preview.patch
===================================================================
# 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",