rpms/nautilus/devel description-leak.patch, NONE, 1.1 filesystem-id-cmp.patch, NONE, 1.1 nautilus-leaks.patch, NONE, 1.1 nautilus.spec, 1.227, 1.228

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19337

Modified Files:
	nautilus.spec 
Added Files:
	description-leak.patch filesystem-id-cmp.patch 
	nautilus-leaks.patch 
Log Message:
plug memory leaks


description-leak.patch:

--- NEW FILE description-leak.patch ---
diff -up nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c
--- nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak	2008-09-20 23:57:57.000000000 -0400
+++ nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c	2008-09-20 23:58:29.000000000 -0400
@@ -907,10 +907,10 @@ set_uri_and_type (NautilusOpenWithDialog
 		description = g_content_type_get_description (mime_type);
 
 		if (description == NULL) {
-			description = _("Unknown");
+			description = g_strdup (_("Unknown"));
 		}
 
-		dialog->details->type_description = g_strdup (description);
+		dialog->details->type_description = description;
 	}
 	g_free (extension);
 

filesystem-id-cmp.patch:

--- NEW FILE filesystem-id-cmp.patch ---
diff -up nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp nautilus-2.23.92/libnautilus-private/nautilus-file.c
--- nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp	2008-09-20 20:52:38.000000000 -0400
+++ nautilus-2.23.92/libnautilus-private/nautilus-file.c	2008-09-20 20:53:20.000000000 -0400
@@ -1836,7 +1836,7 @@ update_info_internal (NautilusFile *file
 	}
 
 	filesystem_id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-	if (eel_strcmp (file->details->filesystem_id, filesystem_id) != 0) {
+	if (eel_strcmp (eel_ref_str_peek (file->details->filesystem_id), filesystem_id) != 0) {
 		changed = TRUE;
 		eel_ref_str_unref (file->details->filesystem_id);
 		file->details->filesystem_id = eel_ref_str_get_unique (filesystem_id);

nautilus-leaks.patch:

--- NEW FILE nautilus-leaks.patch ---
1eaa3d102a9df49cf41fe46fc01e88f8c1382c51
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 2c9ab69..4f9002f 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -691,6 +691,7 @@ finalize (GObject *object)
 
 	eel_g_list_free_deep (file->details->pending_extension_emblems);
 	eel_g_list_free_deep (file->details->extension_emblems);	
+	eel_g_object_list_free (file->details->pending_info_providers);
 
 	if (file->details->pending_extension_attributes) {
 		g_hash_table_destroy (file->details->pending_extension_attributes);
@@ -6530,6 +6531,9 @@ invalidate_thumbnail (NautilusFile *file)
 void
 nautilus_file_invalidate_extension_info_internal (NautilusFile *file)
 {
+	if (file->details->pending_info_providers)
+		eel_g_object_list_free (file->details->pending_info_providers);
+
 	file->details->pending_info_providers =
 		nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_INFO_PROVIDER);
 }


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- nautilus.spec	9 Sep 2008 00:55:52 -0000	1.227
+++ nautilus.spec	21 Sep 2008 04:38:24 -0000	1.228
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.23.92
-Release:	1%{?dist}
+Release:	3%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -99,6 +99,13 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=552310
+Patch22: 	nautilus-leaks.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553073
+Patch23:	filesystem-id-cmp.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=553084
+Patch24: 	description-leak.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -137,6 +144,9 @@
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
+%patch22 -p1 -b .leaks
+%patch23 -p1 -b .filesystem-id-cmp
+%patch24 -p1 -b .description-leak
 
 %build
 
@@ -144,7 +154,8 @@
 aclocal
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
+#CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
+CFLAGS="-O0 -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
 
 export tagname=CC
 LANG=en_US make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
@@ -255,6 +266,12 @@
 
 
 %changelog
+* Sat Sep 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-3
+- Plug some memory leaks
+
+* Fri Sep 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-2
+- Plug some memory leaks
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92