Don't try to filter if impl->current_filter is NULL. (#161329, R.

2004-12-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't
	try to filter if impl->current_filter is NULL.  (#161329,
	R. McFarland)

diff --git a/ChangeLog b/ChangeLog
index 53215e43b0e689e0e037751139e709658807e16e..46a6f4edc4763acf3ae59071f89e4d182aa265a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't 
+       try to filter if impl->current_filter is NULL.  (#161329, 
+       R. McFarland) 
+
 2004-12-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 53215e43b0e689e0e037751139e709658807e16e..46a6f4edc4763acf3ae59071f89e4d182aa265a1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't 
+       try to filter if impl->current_filter is NULL.  (#161329, 
+       R. McFarland) 
+
 2004-12-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 53215e43b0e689e0e037751139e709658807e16e..46a6f4edc4763acf3ae59071f89e4d182aa265a1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't 
+       try to filter if impl->current_filter is NULL.  (#161329, 
+       R. McFarland) 
+
 2004-12-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 53215e43b0e689e0e037751139e709658807e16e..46a6f4edc4763acf3ae59071f89e4d182aa265a1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't 
+       try to filter if impl->current_filter is NULL.  (#161329, 
+       R. McFarland) 
+
 2004-12-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-4:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9bb6b38899bad8f65fdcf50c00f5969d84e656c2..146f758381671ca85aac9c072d37765e909e39d3 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4004,6 +4004,9 @@ get_is_file_filtered (GtkFileChooserDefault *impl,
   GtkFileFilterFlags needed;
   gboolean result;
 
+  if (!impl->current_filter)
+    return FALSE;
+
   filter_info.contains = GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE;
 
   needed = gtk_file_filter_get_needed (impl->current_filter);