Free the filters. Fixes #133547, patch by Morten Welinder

2004-02-10  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
	Free the filters.  Fixes #133547, patch by Morten Welinder
	<mortenw@gnome.org>.

diff --git a/ChangeLog b/ChangeLog
index eb909cdff9b6d90c0b03834878703dea2ac842af..9b8a1184e5bb8bcc1350df2fce3d0985f3c0bcdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Free the filters.  Fixes #133547, patch by Morten Welinder
+       <mortenw@gnome.org>.
+
 Tue Feb 10 12:02:14 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/xsettings-client.c (read_settings): Avoid

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eb909cdff9b6d90c0b03834878703dea2ac842af..9b8a1184e5bb8bcc1350df2fce3d0985f3c0bcdc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Free the filters.  Fixes #133547, patch by Morten Welinder
+       <mortenw@gnome.org>.
+
 Tue Feb 10 12:02:14 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/xsettings-client.c (read_settings): Avoid

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index eb909cdff9b6d90c0b03834878703dea2ac842af..9b8a1184e5bb8bcc1350df2fce3d0985f3c0bcdc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Free the filters.  Fixes #133547, patch by Morten Welinder
+       <mortenw@gnome.org>.
+
 Tue Feb 10 12:02:14 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/xsettings-client.c (read_settings): Avoid

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eb909cdff9b6d90c0b03834878703dea2ac842af..9b8a1184e5bb8bcc1350df2fce3d0985f3c0bcdc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Free the filters.  Fixes #133547, patch by Morten Welinder
+       <mortenw@gnome.org>.
+
 Tue Feb 10 12:02:14 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/xsettings-client.c (read_settings): Avoid

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eb909cdff9b6d90c0b03834878703dea2ac842af..9b8a1184e5bb8bcc1350df2fce3d0985f3c0bcdc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Free the filters.  Fixes #133547, patch by Morten Welinder
+       <mortenw@gnome.org>.
+
 Tue Feb 10 12:02:14 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/xsettings-client.c (read_settings): Avoid

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index f00a5a2847b74f1dad28d147701935378c8ddbd3..0768ed764c5952915c02b7478d00dde6165312d1 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -369,6 +369,7 @@ static void
 gtk_file_chooser_default_finalize (GObject *object)
 {
   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
+  GSList *l;
 
   g_signal_handler_disconnect (impl->file_system, impl->volumes_changed_id);
   impl->volumes_changed_id = 0;
@@ -376,7 +377,17 @@ gtk_file_chooser_default_finalize (GObject *object)
   impl->bookmarks_changed_id = 0;
   g_object_unref (impl->file_system);
 
-  /* FIXME: Free impl->filters -- what's the memory management there? */
+  for (l = impl->filters; l; l = l->next)
+    {
+      GtkFileFilter *filter;
+
+      filter = GTK_FILE_FILTER (l->data);
+      g_object_unref (filter);
+    }
+  g_slist_free (impl->filters);
+
+  if (impl->current_filter)
+    g_object_unref (impl->current_filter);
 
   if (impl->current_volume_path)
     gtk_file_path_free (impl->current_volume_path);