From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 17 Feb 2009 23:36:13 +0000 (+0000)
Subject: unref the destination's attribute matcher before overwriting it.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3fd881b5bb5e27af98303fd0aaaddb5db65d0085;p=dana%2Fcg-glib.git

unref the destination's attribute matcher before overwriting it.

2009-02-17  Ryan Lortie  <desrt@desrt.ca>

        * gfileinfo.c: unref the destination's attribute matcher before
        overwriting it.


svn path=/trunk/; revision=7879
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 554cce01..9725a7b3 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-17  Ryan Lortie  <desrt@desrt.ca>
+
+	* gfileinfo.c: unref the destination's attribute matcher before
+	overwriting it.
+
 2009-02-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.19.8 ===
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index b772fee6..e4968d1e 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -302,6 +302,9 @@ g_file_info_copy_into (GFileInfo *src_info,
       _g_file_attribute_value_set (&dest[i].value, &source[i].value);
     }
 
+  if (dest_info->mask != NO_ATTRIBUTE_MASK)
+    g_file_attribute_matcher_unref (dest_info->mask);
+
   if (src_info->mask == NO_ATTRIBUTE_MASK)
     dest_info->mask = NO_ATTRIBUTE_MASK;
   else