From ab7aa3e1135b53b361205ab8038b88edbc57ac13 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 2 Oct 2008 19:47:35 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20554690=20=E2=80=93=20mem=20leak=20in=20fi?= =?UTF-8?q?lechooser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=21567 --- ChangeLog | 6 ++++++ gtk/gtkfilechooserdefault.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1026e9bbab..246eac78e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-02 Christian Persch + + Bug 554690 – mem leak in filechooser + + * gtk/gtkfilechooserdefault.c: Plug a mem leak. + 2008-10-02 Michael Natterer Bug 553585 – Add orientation API to GtkRuler diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 8881936dc2..1248e7b27f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2074,10 +2074,17 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl) if (_gtk_file_system_volume_is_mounted (volume)) { GFile *base_file; + gboolean base_is_native = TRUE; base_file = _gtk_file_system_volume_get_root (volume); - if (base_file != NULL && !g_file_is_native (base_file)) - continue; + if (base_file != NULL) + { + base_is_native = g_file_is_native (base_file); + g_object_unref (base_file); + } + + if (!base_is_native) + continue; } }