brasero r940 - in trunk: . src src/plugins/cdrtools

[philippr svn gnome org]

Author: philippr
Date: Tue Jul  1 11:26:46 2008
New Revision: 940
URL: http://svn.gnome.org/viewvc/brasero?rev=940&view=rev

Log:
	Fix #540931 â Fails to burn an iso to DVD+RW in 0.7.90

	* src/burn-caps.c (brasero_caps_get_flags),
	(brasero_caps_disc_new_status):
	* src/burn-medium.c (brasero_medium_track_volume_size),
	(brasero_medium_get_sessions_info):
	* src/plugins/cdrtools/burn-cdrecord.c
	(brasero_cdrecord_export_caps):

Modified:
   trunk/ChangeLog
   trunk/src/burn-caps.c
   trunk/src/burn-medium.c
   trunk/src/plugins/cdrtools/burn-cdrecord.c

Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c	(original)
+++ trunk/src/burn-caps.c	Tue Jul  1 11:26:46 2008
@@ -2121,6 +2121,7 @@
 			/* see if that link can handle the record flags.
 			 * NOTE: compulsory are not a failure in this case. */
 			tmp = session_flags & BRASERO_PLUGIN_BURN_FLAG_MASK;
+			g_print ("MAAKKS  %i %i\n", tmp, rec_supported);
 			if ((tmp & rec_supported) != tmp)
 				continue;
 		}
@@ -3035,6 +3036,9 @@
 			/* This is only for above types */
 			retval = brasero_caps_disc_lookup_or_create (retval,
 								     media|
+								     BRASERO_MEDIUM_BLANK);
+			retval = brasero_caps_disc_lookup_or_create (retval,
+								     media|
 								     BRASERO_MEDIUM_BLANK|
 								     (type & BRASERO_MEDIUM_UNFORMATTED));
 		}

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Tue Jul  1 11:26:46 2008
@@ -1185,6 +1185,7 @@
 				       &nb_blocks,
 				       NULL);
 	brasero_volume_source_close (vol);
+
 	if (!res) {
 		BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s",
 				  error && error->message ? 
@@ -1889,8 +1890,10 @@
 				g_free (track);
 
 				priv->info |= BRASERO_MEDIUM_BLANK;
-				priv->info &= ~BRASERO_MEDIUM_CLOSED|
-					       BRASERO_MEDIUM_HAS_DATA;
+				priv->info &= ~(BRASERO_MEDIUM_CLOSED|
+					        BRASERO_MEDIUM_HAS_DATA);
+
+				BRASERO_BURN_LOG ("Empty first session.");
 			}
 			else
 				priv->next_wr_add = 0;

Modified: trunk/src/plugins/cdrtools/burn-cdrecord.c
==============================================================================
--- trunk/src/plugins/cdrtools/burn-cdrecord.c	(original)
+++ trunk/src/plugins/cdrtools/burn-cdrecord.c	Tue Jul  1 11:26:46 2008
@@ -1064,7 +1064,7 @@
 					BRASERO_PLUGIN_IO_ACCEPT_FILE,
 					BRASERO_IMAGE_FORMAT_BIN);
 
-	/* cdrecord can burn all DVDs (except restricted)when it's ISOs */
+	/* cdrecord can burn all DVDs (except restricted) when it's ISOs */
 	output = brasero_caps_disc_new (dvd_media);
 	brasero_plugin_link_caps (plugin, output, input);
 	g_slist_free (output);