rpms/nautilus/F-12 nautilus-2.29.xx-nautilus-directory-leak.patch, NONE, 1.1 nautilus.spec, 1.295, 1.296

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27828

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.29.xx-nautilus-directory-leak.patch 
Log Message:
* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
- Fix some memory leaks


nautilus-2.29.xx-nautilus-directory-leak.patch:
 libnautilus-private/nautilus-file.c |    3 ++-
 src/nautilus-navigation-window.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE nautilus-2.29.xx-nautilus-directory-leak.patch ---
>From ac9f08eb1f74b32c432b0a4904fb57e982202a4c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:13 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 5175118..cd48f7e 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1580,6 +1580,7 @@ real_sync_search_widgets (NautilusWindow *window)
 		navigation_window->details->temporary_search_bar = TRUE;
 		hide_temporary_bars (navigation_window);
 	}
+	nautilus_directory_unref (directory);
 }
 
 
--
cgit v0.8.2
>From 2d61fcdf4987802441b7d9dab5364a28fb2dbd7c Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Tue, 08 Dec 2009 15:28:30 +0000
Subject: Don't leak NautilusDirectory

---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index df16e1f..fdb1bdc 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -6635,6 +6635,8 @@ nautilus_file_get_volume_free_space (NautilusFile *file)
 						    get_fs_free_cb,
 						    directory); /* Inherits ref */
 		g_object_unref (location);
+	} else {
+		nautilus_directory_unref (directory);
 	}
 
 
--
cgit v0.8.2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- nautilus.spec	30 Nov 2009 13:32:55 -0000	1.295
+++ nautilus.spec	8 Dec 2009 16:21:39 -0000	1.296
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -81,6 +81,9 @@ Patch6:		nautilus-2.28.1-dynamic-search.
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
 
+# from upstream
+Patch9:		nautilus-2.29.xx-nautilus-directory-leak.patch
+
 Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
@@ -126,6 +129,7 @@ for developing nautilus extensions.
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
+%patch9 -p1 -b .memleaks
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
@@ -265,6 +269,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.2-2
+- Fix some memory leaks
+
 * Mon Nov 30 2009 Alexander Larsson <alexl at redhat.com> - 2.28.2-1
 - Update to 2.28.2