brasero r1384 - in trunk: . src src/plugins/cdrdao

[philippr svn gnome org]

Author: philippr
Date: Thu Oct 16 19:38:17 2008
New Revision: 1384
URL: http://svn.gnome.org/viewvc/brasero?rev=1384&view=rev

Log:
	Ensure that if CD-TEXT string can\'t be converted to UTF-8 we keep the
	original one since it may (must if brasero burnt it) be already UTF-8

	* src/burn-drive.c (brasero_drive_lock), (brasero_drive_unlock):
	* src/burn-medium.c (brasero_medium_get_CD_TEXT):
	* src/burn-volume-obj.c (brasero_volume_eject):
	* src/burn.c (brasero_burn_eject_src_media):
	* src/plugins/cdrdao/burn-cdrdao.c (brasero_cdrdao_set_argv_image):


Modified:
   trunk/ChangeLog
   trunk/src/burn-drive.c
   trunk/src/burn-medium.c
   trunk/src/burn-volume-obj.c
   trunk/src/burn.c
   trunk/src/plugins/cdrdao/burn-cdrdao.c

Modified: trunk/src/burn-drive.c
==============================================================================
--- trunk/src/burn-drive.c	(original)
+++ trunk/src/burn-drive.c	Thu Oct 16 19:38:17 2008
@@ -197,6 +197,13 @@
 	if (failure)
 		dbus_free (failure);
 
+	if (result) {
+		BRASERO_BURN_LOG ("Device locked");
+	}
+	else {
+		BRASERO_BURN_LOG ("Device failed to lock");
+	}
+
 	return result;
 }
 
@@ -210,7 +217,6 @@
 	gboolean result;
 
 	priv = BRASERO_DRIVE_PRIVATE (self);
-
 	if (!priv->udi)
 		return FALSE;
 
@@ -225,6 +231,7 @@
 	if (dbus_error_is_set (&error))
 		dbus_error_free (&error);
 
+	BRASERO_BURN_LOG ("Device unlocked");
 	return result;
 }
 

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Thu Oct 16 19:38:17 2008
@@ -2722,7 +2722,6 @@
 	 * be extented to all tracks information. */
 	switch (type) {
 	case BRASERO_SCSI_CD_TEXT_ALBUM_TITLE:
-		BRASERO_BURN_LOG ("Title %s", string);
 		if (track_num)
 			return FALSE;
 
@@ -2756,7 +2755,12 @@
 	if (priv->CD_TEXT_title)
 		g_free (priv->CD_TEXT_title);
 
-	priv->CD_TEXT_title = utf8_string;
+	if (!utf8_string)
+		priv->CD_TEXT_title = g_strdup (string);
+	else
+		priv->CD_TEXT_title = utf8_string;
+
+	BRASERO_BURN_LOG ("CD-TEXT title %s", priv->CD_TEXT_title);
 	return TRUE;
 }
 

Modified: trunk/src/burn-volume-obj.c
==============================================================================
--- trunk/src/burn-volume-obj.c	(original)
+++ trunk/src/burn-volume-obj.c	Thu Oct 16 19:38:17 2008
@@ -600,6 +600,8 @@
 	gboolean result;
 	BraseroVolumePrivate *priv;
 
+	BRASERO_BURN_LOG ("Ejecting");
+
 	if (!self)
 		return TRUE;
 
@@ -609,6 +611,8 @@
 	if (!gdrive) {
 		GVolume *volume;
 
+		BRASERO_BURN_LOG ("No GDrive");
+
 		/* last resort */
 		volume = brasero_volume_get_gvolume (self);
 
@@ -620,6 +624,8 @@
 	if (!g_drive_can_eject (gdrive)) {
 		GVolume *volume;
 
+		BRASERO_BURN_LOG ("GDrive can't eject");
+
 		/* last resort */
 		volume = brasero_volume_get_gvolume (self);
 

Modified: trunk/src/burn.c
==============================================================================
--- trunk/src/burn.c	(original)
+++ trunk/src/burn.c	Thu Oct 16 19:38:17 2008
@@ -365,6 +365,7 @@
 		return BRASERO_BURN_OK;
 
 	medium = brasero_drive_get_medium (priv->src);
+
 	if (brasero_volume_is_mounted (BRASERO_VOLUME (medium))) {
 		BraseroBurnResult result;
 

Modified: trunk/src/plugins/cdrdao/burn-cdrdao.c
==============================================================================
--- trunk/src/plugins/cdrdao/burn-cdrdao.c	(original)
+++ trunk/src/plugins/cdrdao/burn-cdrdao.c	Thu Oct 16 19:38:17 2008
@@ -422,7 +422,6 @@
 	/* This is done so that if a cue file is required we first generate
 	 * a temporary toc file that will be later converted to a cue file.
 	 * The datafile is written where it should be from the start. */
-
 	brasero_job_get_output_type (BRASERO_JOB (cdrdao), &output);
 	if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_CDRDAO) {
 		result = brasero_job_get_image_output (BRASERO_JOB (cdrdao),