Fix leaks. Patch from Martin Wehner <martin.wehner@epost.de>

2003-10-21  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-desktop-link.c:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-file.c:
	* libnautilus-private/nautilus-icon-factory.c:
	* src/nautilus-application.c:
	* src/nautilus-bookmark-list.c:
	Fix leaks.
	Patch from Martin Wehner <martin.wehner@epost.de>

7 files changed, 31 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bf181d451..89c990d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-21  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-desktop-link.c:
+	* libnautilus-private/nautilus-file-operations.c:
+	* libnautilus-private/nautilus-file.c:
+	* libnautilus-private/nautilus-icon-factory.c: 
+	* src/nautilus-application.c:
+	* src/nautilus-bookmark-list.c:
+	Fix leaks.
+	Patch from Martin Wehner <martin.wehner@epost.de>
+
 === nautilus 2.4.1 ===
 
 2003-10-13  Alexander Larsson  <alexl@redhat.com>
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index e1ec5635e..d48938530 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -367,6 +367,14 @@ desktop_link_finalize (GObject *object)
 						 link);
 	}
 	
+	if (link->details->type == NAUTILUS_DESKTOP_LINK_VOLUME) {
+		g_free (link->details->mount_path);
+	}
+
+	g_free (link->details->filename);
+	g_free (link->details->display_name);
+	g_free (link->details->activation_uri);
+	g_free (link->details->icon);
 	g_free (link->details);
 
 	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 1edfe54b2..090973588 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1054,7 +1054,8 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace"), _("Skip"), NULL);
-			 
+		g_free (text);	 
+
 		nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog);
 					 
 		switch (result) {
@@ -1071,6 +1072,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 			(parent_for_error_dialog (transfer_info), TRUE, text, 
 			 _("Conflict while copying"),
 			 _("Replace All"), _("Replace"), _("Skip"), NULL);
+		g_free (text);
 
 		nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog);
 
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index f0fb5ad87..2fbbbc831 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -1022,6 +1022,7 @@ rename_guts (NautilusFile *file,
 	 * But not for .desktop files as '/' are allowed for them */
 	if (strstr (new_name, "/") != NULL && !is_local_desktop_file) {
 		(* callback) (file, GNOME_VFS_ERROR_NOT_PERMITTED, callback_data);
+		g_free (uri);
 		return;
 	}
 	
@@ -1037,6 +1038,7 @@ rename_guts (NautilusFile *file,
 		 */
 		nautilus_file_changed (file);
 		(* callback) (file, GNOME_VFS_ERROR_NOT_FOUND, callback_data);
+		g_free (uri);
 		return;
 	}
 
@@ -1046,6 +1048,7 @@ rename_guts (NautilusFile *file,
 	 */
 	if (name_is (file, new_name)) {
 		(* callback) (file, GNOME_VFS_OK, callback_data);
+		g_free (uri);
 		return;
 	}
 
@@ -1060,6 +1063,7 @@ rename_guts (NautilusFile *file,
 		 */
 		nautilus_file_changed (file);
 		(* callback) (file, GNOME_VFS_ERROR_NOT_SUPPORTED, callback_data);
+		g_free (uri);
 		return;
 	}
 
@@ -1068,7 +1072,7 @@ rename_guts (NautilusFile *file,
 		NautilusDesktopLink *link;
 
 		link = nautilus_desktop_icon_file_get_link (NAUTILUS_DESKTOP_ICON_FILE (file));
-
+		
 		if (nautilus_desktop_link_rename (link, new_name)) {
 			(* callback) (file, GNOME_VFS_OK, callback_data);
 		} else {
@@ -1076,6 +1080,7 @@ rename_guts (NautilusFile *file,
 		}
 		
 		g_object_unref (link);
+		g_free (uri);
 		return;
 	}
 	
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 9a898a82a..6584f5d8e 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -393,6 +393,7 @@ static void
 cache_key_destroy (CacheKey *key)
 {
 	g_free (key->name);
+	g_free (key->modifier);
 	g_free (key);
 }
 
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 723aba5ac..e1086c70f 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -319,6 +319,7 @@ migrate_old_nautilus_files (void)
 				      _("Migrated old desktop"),
 				      NULL);
 	}
+	g_free (old_desktop_dir);
 	g_free (migrated_file);
 }
 
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 3f67f7f8c..e57bc5399 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -147,6 +147,7 @@ append_bookmark_node (gpointer data, gpointer user_data)
 	if (icon != NULL) {
 		/* Don't bother storing modifier or embedded text for bookmarks. */
 		xmlSetProp (bookmark_node, "icon_name", icon);
+		g_free (icon);
 	}
 }