brasero r2005 - in trunk: . libbrasero-media

[philippr svn gnome org]

Author: philippr
Date: Wed Feb 25 20:49:15 2009
New Revision: 2005
URL: http://svn.gnome.org/viewvc/brasero?rev=2005&view=rev

Log:
2009-02-25  Philippe Rouquier  <bonfire-app wanadoo fr>

	Some confusion in the returned values fixed (harmless): cleanup

	* libbrasero-media/brasero-medium.c (brasero_medium_get_contents):

Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/brasero-medium.c

Modified: trunk/libbrasero-media/brasero-medium.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium.c	(original)
+++ trunk/libbrasero-media/brasero-medium.c	Wed Feb 25 20:49:15 2009
@@ -2144,6 +2144,7 @@
 			     BraseroScsiErrCode *code)
 {
 	int size;
+	BraseroBurnResult res;
 	BraseroScsiResult result;
 	BraseroMediumPrivate *priv;
 	BraseroScsiDiscInfoStd *info = NULL;
@@ -2177,10 +2178,10 @@
 	priv->first_open_track = -1;
 
 	if (info->status == BRASERO_SCSI_DISC_EMPTY) {
-		brasero_medium_set_blank (self,
-					  handle,
-					  BRASERO_FIRST_TRACK_IN_LAST_SESSION (info),
-					  code);
+		res = brasero_medium_set_blank (self,
+						handle,
+						BRASERO_FIRST_TRACK_IN_LAST_SESSION (info),
+						code);
 	}
 	else if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) {
 		if (!BRASERO_MEDIUM_RANDOM_WRITABLE (priv->info)) {
@@ -2190,27 +2191,27 @@
 			priv->first_open_track = BRASERO_FIRST_TRACK_IN_LAST_SESSION (info);
 			BRASERO_MEDIA_LOG ("First track in last open session %d", priv->first_open_track);
 
-			result = brasero_medium_get_sessions_info (self, handle, code);
+			res = brasero_medium_get_sessions_info (self, handle, code);
 		}
 		else {
 			/* if that type of media is in incomplete state that
 			 * means it has just been formatted. And therefore it's
 			 * blank. */
-			brasero_medium_set_blank (self,
-						  handle,
-						  BRASERO_FIRST_TRACK_IN_LAST_SESSION (info),
-						  code);
+			res = brasero_medium_set_blank (self,
+							handle,
+							BRASERO_FIRST_TRACK_IN_LAST_SESSION (info),
+							code);
 		}
 	}
 	else if (info->status == BRASERO_SCSI_DISC_FINALIZED) {
 		priv->info |= BRASERO_MEDIUM_CLOSED;
 		BRASERO_MEDIA_LOG ("Closed media");
 
-		result = brasero_medium_get_sessions_info (self, handle, code);
+		res = brasero_medium_get_sessions_info (self, handle, code);
 	}
 
 	g_free (info);
-	return result;
+	return res;
 }
 
 /**