[bluefish] Fix crash in File Open dialog with filter applied

[Paul Howarth]

commit 7c08402c412c71a6859c4524b76fbd2c36a02a75
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Aug 26 10:23:08 2010 +0100

    Fix crash in File Open dialog with filter applied
    
    Apply upstream patch for #626246 in which bluefish crashes if a
    filter (e.g. "Web Files") is applied in the File Open dialog.

 Fedora_bug_626246.patch |   22 ++++++++++++++++++++++
 bluefish.spec           |    5 +++++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/Fedora_bug_626246.patch b/Fedora_bug_626246.patch
new file mode 100644
index 0000000..2671735
--- /dev/null
+++ b/Fedora_bug_626246.patch
@@ -0,0 +1,22 @@
+Index: src/gtk_easy.c
+===================================================================
+--- src/gtk_easy.c	(revision 6064)
++++ src/gtk_easy.c	(working copy)
+@@ -1362,7 +1362,7 @@
+ 		GtkFileFilter* ff;
+ 		ff = gtk_file_filter_new();
+ 		gtk_file_filter_set_name(ff,_("All files"));
+-		gtk_file_filter_add_custom(ff, GTK_FILE_FILTER_DISPLAY_NAME, 
++		gtk_file_filter_add_custom(ff, GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE,
+ 		                           (GtkFileFilterFunc) file_chooser_custom_filter_func,
+                                    new_fchooser_filter(dialog, viewbackup, NULL),g_free);
+ 		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), ff);
+@@ -1370,7 +1370,7 @@
+ 			Tfilter *filter =tmplist->data;
+ 			ff = gtk_file_filter_new();
+ 			gtk_file_filter_set_name(ff,filter->name);
+-			gtk_file_filter_add_custom(ff, GTK_FILE_FILTER_DISPLAY_NAME, 
++			gtk_file_filter_add_custom(ff, GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE,
+ 			                           (GtkFileFilterFunc) file_chooser_custom_filter_func,
+                                        new_fchooser_filter(dialog, viewbackup, filter),g_free);
+ 			gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), ff);
diff --git a/bluefish.spec b/bluefish.spec
index 06f588b..2a7937b 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -10,6 +10,7 @@ Group:		Development/Tools
 License:	GPLv2+
 URL:		http://bluefish.openoffice.nl/
 Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
+Patch0:		Fedora_bug_626246.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
@@ -63,6 +64,9 @@ Files common to every architecture version of %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
+# Upstream patch addressing crash in File Open dialog with filter applied (#626246)
+%patch0 -p0
+
 %build
 %configure	--disable-dependency-tracking \
 		--disable-static \
@@ -140,6 +144,7 @@ fi
 
 %changelog
 * Thu Aug 26 2010 Paul Howarth <paul at city-fan.org> - 2.0.1-2
+- Fix crash in File Open dialog with filter applied (#626246)
 - Change buildreq "man" to "/usr/bin/man" since the "man" package has been
   obsoleted by "man-db" from Fedora 14