nautilus r13643 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Wed Jan 23 09:14:12 2008
New Revision: 13643
URL: http://svn.gnome.org/viewvc/nautilus?rev=13643&view=rev

Log:
2008-01-23  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-file-operations.c:
	Don't leak enumerators
	
        * libnautilus-private/nautilus-trash-monitor.c:
	Don't leak file info

	Fixes from Matthias Clasen



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c
   trunk/libnautilus-private/nautilus-trash-monitor.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Wed Jan 23 09:14:12 2008
@@ -1227,6 +1227,7 @@
 			g_object_unref (info);
 		}
 		g_file_enumerator_close (enumerator, job->cancellable, NULL);
+		g_object_unref (enumerator);
 		
 		if (error && IS_IO_ERROR (error, CANCELLED)) {
 			g_error_free (error);
@@ -1787,6 +1788,7 @@
 		}
 		
 		g_file_enumerator_close (enumerator, NULL, NULL);
+		g_object_unref (enumerator);
 	}
 	
 
@@ -2092,6 +2094,7 @@
 			g_object_unref (info);
 		}
 		g_file_enumerator_close (enumerator, job->cancellable, NULL);
+		g_object_unref (enumerator);
 		
 		if (error && IS_IO_ERROR (error, CANCELLED)) {
 			g_error_free (error);
@@ -2856,6 +2859,7 @@
 			g_object_unref (info);
 		}
 		g_file_enumerator_close (enumerator, job->cancellable, NULL);
+		g_object_unref (enumerator);
 		
 		if (error && IS_IO_ERROR (error, CANCELLED)) {
 			g_error_free (error);
@@ -3023,6 +3027,7 @@
 			g_object_unref (info);
 		}
 		g_file_enumerator_close (enumerator, job->cancellable, NULL);
+		g_object_unref (enumerator);
 		
 	} else if (IS_IO_ERROR (error, NOT_DIRECTORY)) {
 		/* Not a dir, continue */
@@ -4403,6 +4408,7 @@
 				g_object_unref (child_info);
 			}
 			g_file_enumerator_close (enumerator, common->cancellable, NULL);
+			g_object_unref (enumerator);
 		} 
 	}
 	if (free_info) {
@@ -4882,6 +4888,7 @@
 			g_object_unref (info);
 		}
 		g_file_enumerator_close (enumerator, job->cancellable, NULL);
+		g_object_unref (enumerator);
 	} 
 	
 	if (!job_aborted (job) && del_dir) {

Modified: trunk/libnautilus-private/nautilus-trash-monitor.c
==============================================================================
--- trunk/libnautilus-private/nautilus-trash-monitor.c	(original)
+++ trunk/libnautilus-private/nautilus-trash-monitor.c	Wed Jan 23 09:14:12 2008
@@ -128,6 +128,7 @@
 				       signals[TRASH_STATE_CHANGED], 0,
 				       trash_monitor->details->empty);
 		}
+		g_object_unref (info);
 	}
 
 	g_object_unref (trash_monitor);