brasero r1913 - in trunk: . src/plugins/cdrtools src/plugins/libburnia

[philippr svn gnome org]

Author: philippr
Date: Sat Feb 14 14:49:47 2009
New Revision: 1913
URL: http://svn.gnome.org/viewvc/brasero?rev=1913&view=rev

Log:
2009-02-14  Philippe Rouquier  <ykw localhost localdomain>

	Mark a string for translation (not changes in strings though)
	Avoid erroring out when the task is already finished when we check for
	thread creation result.

	* src/plugins/cdrtools/burn-mkisofs.c
	(brasero_mkisofs_set_argv_image):
	* src/plugins/libburnia/burn-libisofs.c
	(brasero_libisofs_write_image_to_file_thread),
	(brasero_libisofs_thread_started), (brasero_libisofs_create_image),
	(brasero_libisofs_create_volume_thread_finished):


Modified:
   trunk/ChangeLog
   trunk/src/plugins/cdrtools/burn-mkisofs.c
   trunk/src/plugins/libburnia/burn-libisofs.c

Modified: trunk/src/plugins/cdrtools/burn-mkisofs.c
==============================================================================
--- trunk/src/plugins/cdrtools/burn-mkisofs.c	(original)
+++ trunk/src/plugins/cdrtools/burn-mkisofs.c	Sat Feb 14 14:49:47 2009
@@ -299,6 +299,7 @@
 	}
 
 	result = brasero_track_get_data_paths (track,
+					       (type.subtype.fs_type & BRASERO_IMAGE_FS_JOLIET) != 0,
 					       grafts_path,
 					       excluded_path,
 					       emptydir,

Modified: trunk/src/plugins/libburnia/burn-libisofs.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libisofs.c	(original)
+++ trunk/src/plugins/libburnia/burn-libisofs.c	Sat Feb 14 14:49:47 2009
@@ -220,7 +220,7 @@
 		if (errno == EACCES)
 			priv->error = g_error_new_literal (BRASERO_BURN_ERROR,
 							   BRASERO_BURN_ERROR_PERMISSION,
-							   "You do not have the required permission to write at this location");
+							   _("You do not have the required permission to write at this location"));
 		else
 			priv->error = g_error_new_literal (BRASERO_BURN_ERROR,
 							   BRASERO_BURN_ERROR_GENERAL,
@@ -272,7 +272,7 @@
 	self = BRASERO_LIBISOFS (data);
 	priv = BRASERO_LIBISOFS_PRIVATE (self);
 
-	BRASERO_JOB_LOG (self, "entering thread");
+	BRASERO_JOB_LOG (self, "Entering thread");
 	if (brasero_job_get_fd_out (BRASERO_JOB (self), NULL) == BRASERO_BURN_OK)
 		brasero_libisofs_write_image_to_fd_thread (self);
 	else
@@ -281,6 +281,8 @@
 	if (!priv->cancel)
 		priv->thread_id = g_idle_add (brasero_libisofs_thread_finished, self);
 
+	BRASERO_JOB_LOG (self, "Getting out thread");
+
 	/* End thread */
 	g_mutex_lock (priv->mutex);
 	priv->thread = NULL;
@@ -296,6 +298,7 @@
 			       GError **error)
 {
 	BraseroLibisofsPrivate *priv;
+	GError *thread_error = NULL;
 
 	priv = BRASERO_LIBISOFS_PRIVATE (self);
 
@@ -316,10 +319,17 @@
 	priv->thread = g_thread_create (brasero_libisofs_thread_started,
 					self,
 					TRUE,
-					error);
+					&thread_error);
 	g_mutex_unlock (priv->mutex);
-	if (!priv->thread)
+
+	/* Reminder: this is not necessarily an error as the thread may have finished */
+	//if (!priv->thread)
+	//	return BRASERO_BURN_ERR;
+
+	if (thread_error) {
+		g_propagate_error (error, thread_error);
 		return BRASERO_BURN_ERR;
+	}
 
 	return BRASERO_BURN_OK;
 }
@@ -350,7 +360,7 @@
 
 		result = brasero_libisofs_create_image (self, &error);
 		if (error)
-			priv->error = error;
+		brasero_job_error (BRASERO_JOB (self), error);
 		else
 			return FALSE;
 	}