brasero r1390 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Oct 18 07:00:34 2008
New Revision: 1390
URL: http://svn.gnome.org/viewvc/brasero?rev=1390&view=rev

Log:
	Fix for file change monitoring we were stopping parent nodes instead of
	children nodes
	Possibly fixing: 552811 â crash after delete used directory

	* src/brasero-file-monitor.c
	(brasero_file_monitor_foreach_cancel_file_cb),
	(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	Sat Oct 18 07:00:34 2008
@@ -35,6 +35,8 @@
 #include "brasero-file-monitor.h"
 #include "burn-debug.h"
 
+#include "brasero-file-node.h"
+
 typedef struct _BraseroFileMonitorPrivate BraseroFileMonitorPrivate;
 struct _BraseroFileMonitorPrivate
 {
@@ -692,7 +694,7 @@
 		BraseroInotifyFileData *file_data = NULL;
 
 		file_data = iter->data;
-		if (data->func (data->callback_data, file_data->callback_data)) {
+		if (data->func (file_data->callback_data, data->callback_data)) {
 			BraseroFileMonitorSearchResult *result;
 
 			result = g_new0 (BraseroFileMonitorSearchResult, 1);
@@ -772,7 +774,7 @@
 
 		data = iter->data;
 		next = iter->next;
-		if (func (callback_data, data->callback_data)) {
+		if (func (data->callback_data, callback_data)) {
 			priv->moved_list = g_slist_remove (priv->moved_list, data);
 			g_source_remove (data->id);
 			g_free (data->name);