brasero r1387 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Oct 17 15:42:56 2008
New Revision: 1387
URL: http://svn.gnome.org/viewvc/brasero?rev=1387&view=rev

Log:
	Fix a potential crash in the file monitor backend

	* src/brasero-file-monitor.c (brasero_file_monitor_foreach_cancel):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-file-monitor.c

Modified: trunk/src/brasero-file-monitor.c
==============================================================================
--- trunk/src/brasero-file-monitor.c	(original)
+++ trunk/src/brasero-file-monitor.c	Fri Oct 17 15:42:56 2008
@@ -727,6 +727,7 @@
 				     gpointer callback_data)
 {
 	GSList *iter;
+	GSList *next;
 	BraseroFileMonitorPrivate *priv;
 	BraseroFileMonitorCancelForeach data;
 
@@ -765,6 +766,20 @@
 	g_hash_table_foreach_remove (priv->directories,
 				     brasero_file_monitor_foreach_cancel_directory_cb,
 				     &data);
+
+	/* Finally get rid of moved that data in moved list */
+	for (iter = priv->moved_list; iter; iter = next) {
+		BraseroInotifyMovedData *data;
+
+		data = iter->data;
+		next = iter->next;
+		if (func (callback_data, data->callback_data)) {
+			priv->moved_list = g_slist_remove (priv->moved_list, data);
+			g_source_remove (data->id);
+			g_free (data->name);
+			g_free (data);
+		}
+	}
 }
 
 static gboolean