brasero r1216 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Aug 30 08:00:02 2008
New Revision: 1216
URL: http://svn.gnome.org/viewvc/brasero?rev=1216&view=rev

Log:
	revert fix for rare race condition as it created another one even worse

	* src/brasero-io.c (brasero_io_job_free), (brasero_io_set_job),
	(brasero_io_load_directory_thread):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-io.c

Modified: trunk/src/brasero-io.c
==============================================================================
--- trunk/src/brasero-io.c	(original)
+++ trunk/src/brasero-io.c	Sat Aug 30 08:00:02 2008
@@ -288,6 +288,9 @@
 	 * return a dummy result to destroy the callback_data if the directory
 	 * is empty. */
 
+	if (job->callback_data)
+		job->callback_data->ref --;
+
 	g_free (job->uri);
 	g_free (job);
 }
@@ -411,6 +414,9 @@
 	job->uri = g_strdup (uri);
 	job->options = options;
 	job->callback_data = callback_data;
+
+	if (callback_data)
+		job->callback_data->ref ++;
 }
 
 static void
@@ -1772,7 +1778,7 @@
 		g_object_unref (child);
 	}
 
-	if (data->job.callback_data && data->job.callback_data->ref < 1) {
+	if (data->job.callback_data && data->job.callback_data->ref < 2) {
 		/* No result was returned so we need to return a dummy one to 
 		 * clean the callback_data in the main loop. */
 		brasero_io_return_result (BRASERO_IO (manager),