brasero r2016 - in trunk: . libbrasero-media src

[philippr svn gnome org]

Author: philippr
Date: Fri Feb 27 19:42:53 2009
New Revision: 2016
URL: http://svn.gnome.org/viewvc/brasero?rev=2016&view=rev

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

	Make sure we use block device (and not raw device) on Open Solaris in 
	some places.

	* libbrasero-media/brasero-drive.c
	(brasero_drive_can_use_exclusively):
	* libbrasero-media/brasero-medium-monitor.c:

Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/brasero-drive.c
   trunk/libbrasero-media/brasero-medium-monitor.c
   trunk/src/burn-job.c

Modified: trunk/libbrasero-media/brasero-drive.c
==============================================================================
--- trunk/libbrasero-media/brasero-drive.c	(original)
+++ trunk/libbrasero-media/brasero-drive.c	Fri Feb 27 19:42:53 2009
@@ -240,14 +240,14 @@
 	BraseroDrivePrivate *priv;
 	GVolume *gvolume;
 	GDrive *gdrive;
-	gboolean res;
+	gboolean res;
 
-	g_return_val_if_fail (drive != NULL, FALSE);
+	g_return_val_if_fail (drive != NULL, FALSE);
 	g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
-
+
 	priv = BRASERO_DRIVE_PRIVATE (drive);
 
-	gdrive = brasero_drive_get_gdrive (drive);
+	gdrive = brasero_drive_get_gdrive (drive);
 	res = brasero_gio_operation_eject_drive (gdrive,
 						 priv->cancel,
 						 wait,
@@ -371,11 +371,7 @@
 	g_return_val_if_fail (drive != NULL, FALSE);
 	g_return_val_if_fail (BRASERO_IS_DRIVE (drive), FALSE);
 
-#if defined(HAVE_STRUCT_USCSI_CMD)
-	device = brasero_drive_get_block_device (drive);
-#else
 	device = brasero_drive_get_device (drive);
-#endif
 
 	handle = brasero_device_handle_open (device, TRUE, NULL);
 	if (!handle)

Modified: trunk/libbrasero-media/brasero-medium-monitor.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium-monitor.c	(original)
+++ trunk/libbrasero-media/brasero-medium-monitor.c	Fri Feb 27 19:42:53 2009
@@ -52,12 +52,6 @@
 #include "burn-hal-watch.h"
 #include "brasero-medium-monitor.h"
 
-#if defined(HAVE_STRUCT_USCSI_CMD)
-#define BLOCK_DEVICE	"block.solaris.raw_device"
-#else
-#define BLOCK_DEVICE	"block.device"
-#endif
-
 typedef struct _BraseroMediumMonitorPrivate BraseroMediumMonitorPrivate;
 struct _BraseroMediumMonitorPrivate
 {

Modified: trunk/src/burn-job.c
==============================================================================
--- trunk/src/burn-job.c	(original)
+++ trunk/src/burn-job.c	Fri Feb 27 19:42:53 2009
@@ -401,7 +401,7 @@
 	else
 		brasero_medium_get_capacity (medium, NULL, &media_blocks);
 
-	/* this is not really an error, we'll probably ask the 
+	/* This is not really an error, we'll probably ask the 
 	 * user to load a new disc */
 	if (output_blocks > media_blocks) {
 		BRASERO_BURN_LOG ("Insufficient space on disc %lli/%lli",