brasero r1446 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Thu Oct 30 14:31:57 2008
New Revision: 1446
URL: http://svn.gnome.org/viewvc/brasero?rev=1446&view=rev

Log:
	Fix a bunch of build warnings that could have turned into crash in some
	rare cases.

	* src/burn-hal-watch.c (brasero_hal_watch_init):
	* src/burn-job.c (brasero_job_set_output_file):
	* src/burn-medium.c (brasero_medium_get_capacity_DVD_RW):


Modified:
   trunk/ChangeLog
   trunk/src/burn-hal-watch.c
   trunk/src/burn-job.c
   trunk/src/burn-medium.c

Modified: trunk/src/burn-hal-watch.c
==============================================================================
--- trunk/src/burn-hal-watch.c	(original)
+++ trunk/src/burn-hal-watch.c	Thu Oct 30 14:31:57 2008
@@ -115,7 +115,7 @@
 {
 	DBusError error;
 	BraseroHALWatchPrivate *priv;
-	DBusConnection *dbus_connection;
+	DBusConnection *dbus_connection = NULL;
 
 	priv = BRASERO_HAL_WATCH_PRIVATE (object);
 
@@ -157,7 +157,8 @@
 	libhal_ctx_free (priv->ctx);
 	priv->ctx = NULL;
 
-	dbus_connection_unref (dbus_connection);
+	if (dbus_connection)
+		dbus_connection_unref (dbus_connection);
 }
 
 static void

Modified: trunk/src/burn-job.c
==============================================================================
--- trunk/src/burn-job.c	(original)
+++ trunk/src/burn-job.c	Thu Oct 30 14:31:57 2008
@@ -541,6 +541,7 @@
 
 	/* no next job so we need a file pad */
 	session = brasero_task_ctx_get_session (priv->ctx);
+	flags = brasero_burn_session_get_flags (session);
 	if (priv->type.type == BRASERO_TRACK_TYPE_IMAGE) {
 		BraseroImageFormat format;
 
@@ -642,8 +643,6 @@
 	priv->output->image = image;
 	priv->output->toc = toc;
 
-	flags = brasero_burn_session_get_flags (session);
-
 	if (flags & BRASERO_BURN_FLAG_CHECK_SIZE)
 		return brasero_job_check_output_volume_space (self, error);
 

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Thu Oct 30 14:31:57 2008
@@ -994,13 +994,13 @@
 		/* if unformatted, a DVD-RAM will return its maximum formattable
 		 * size in this descriptor and that's what we're looking for. */
 		if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVD_RAM)) {
-			priv->block_num = BRASERO_GET_32 (desc->blocks_num);
+			priv->block_num = BRASERO_GET_32 (current->blocks_num);
 			priv->block_size = 2048;
 			goto end;
 		}
 	}
 	else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_BDRE)) {
-		priv->block_num = BRASERO_GET_32 (desc->blocks_num);
+		priv->block_num = BRASERO_GET_32 (current->blocks_num);
 		priv->block_size = 2048;
 		goto end;
 	}