brasero r1541 - in trunk: . src src/plugins/checksum

[philippr svn gnome org]

Author: philippr
Date: Mon Nov 17 20:27:03 2008
New Revision: 1541
URL: http://svn.gnome.org/viewvc/brasero?rev=1541&view=rev

Log:
	Fix checksum-image plugin start
	Fix a string

	* src/brasero-sum-dialog.c (brasero_sum_dialog_success):
	* src/plugins/checksum/burn-checksum-image.c
	(brasero_checksum_get_checksum_type),
	(brasero_checksum_image_image_and_checksum),
	(brasero_checksum_image_activate):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-sum-dialog.c
   trunk/src/plugins/checksum/burn-checksum-image.c

Modified: trunk/src/brasero-sum-dialog.c
==============================================================================
--- trunk/src/brasero-sum-dialog.c	(original)
+++ trunk/src/brasero-sum-dialog.c	Mon Nov 17 20:27:03 2008
@@ -163,7 +163,7 @@
 
 	return brasero_sum_dialog_message (self,
 					   _("The file integrity was performed successfully."),
-					   _("There seems to be no corrupted file on the disc."),
+					   _("There seems to be no corrupted file on the disc"),
 					   GTK_MESSAGE_INFO);
 }
 

Modified: trunk/src/plugins/checksum/burn-checksum-image.c
==============================================================================
--- trunk/src/plugins/checksum/burn-checksum-image.c	(original)
+++ trunk/src/plugins/checksum/burn-checksum-image.c	Mon Nov 17 20:27:03 2008
@@ -374,31 +374,40 @@
 	return BRASERO_BURN_OK;
 }
 
-static BraseroBurnResult
-brasero_checksum_image_image_and_checksum (BraseroChecksumImage *self,
-					   GError **error)
+static BraseroChecksumType
+brasero_checksum_get_checksum_type (void)
 {
 	GConfClient *client;
-	BraseroBurnResult result;
 	GChecksumType checksum_type;
-	BraseroChecksumImagePrivate *priv;
 
-	priv = BRASERO_CHECKSUM_IMAGE_PRIVATE (self);
 	client = gconf_client_get_default ();
-	priv->checksum_type = gconf_client_get_int (client, GCONF_KEY_CHECKSUM_TYPE, NULL);
+	checksum_type = gconf_client_get_int (client, GCONF_KEY_CHECKSUM_TYPE, NULL);
 	g_object_unref (client);
 
-	if (priv->checksum_type == BRASERO_CHECKSUM_NONE)
+	if (checksum_type == BRASERO_CHECKSUM_NONE)
 		checksum_type = G_CHECKSUM_MD5;
-	else if (priv->checksum_type & BRASERO_CHECKSUM_MD5)
+	else if (checksum_type & BRASERO_CHECKSUM_MD5)
 		checksum_type = G_CHECKSUM_MD5;
-	else if (priv->checksum_type & BRASERO_CHECKSUM_SHA1)
+	else if (checksum_type & BRASERO_CHECKSUM_SHA1)
 		checksum_type = G_CHECKSUM_SHA1;
-	else if (priv->checksum_type & BRASERO_CHECKSUM_SHA256)
+	else if (checksum_type & BRASERO_CHECKSUM_SHA256)
 		checksum_type = G_CHECKSUM_SHA256;
 	else
 		checksum_type = G_CHECKSUM_MD5;
 
+	return checksum_type;
+}
+
+static BraseroBurnResult
+brasero_checksum_image_image_and_checksum (BraseroChecksumImage *self,
+					   GError **error)
+{
+	BraseroBurnResult result;
+	BraseroChecksumImagePrivate *priv;
+
+	priv = BRASERO_CHECKSUM_IMAGE_PRIVATE (self);
+	priv->checksum_type = brasero_checksum_get_checksum_type ();
+
 	brasero_job_set_current_action (BRASERO_JOB (self),
 					BRASERO_BURN_ACTION_CHECKSUM,
 					_("Creating image checksum"),
@@ -417,10 +426,10 @@
 		if (result != BRASERO_BURN_OK)
 			return result;
 
-		result = brasero_checksum_image_checksum_file_input (self, checksum_type, error);
+		result = brasero_checksum_image_checksum_file_input (self, priv->checksum_type, error);
 	}
 	else
-		result = brasero_checksum_image_checksum_fd_input (self, checksum_type, error);
+		result = brasero_checksum_image_checksum_fd_input (self, priv->checksum_type, error);
 
 	return result;
 }
@@ -609,8 +618,10 @@
 	brasero_job_get_action (job, &action);
 
 	if (action == BRASERO_JOB_ACTION_IMAGE
-	&&  brasero_track_get_checksum_type (track) != BRASERO_CHECKSUM_NONE) {
-		BRASERO_JOB_LOG (job, "There is a checksum already");
+	&&  brasero_track_get_checksum_type (track) == brasero_checksum_get_checksum_type ()) {
+		BRASERO_JOB_LOG (job,
+				 "There is a checksum already %d",
+				 brasero_track_get_checksum_type (track));
 		/* if there is a checksum already, if so no need to redo one */
 		return BRASERO_BURN_NOT_RUNNING;
 	}