brasero r968 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Thu Jul 10 07:51:10 2008
New Revision: 968
URL: http://svn.gnome.org/viewvc/brasero?rev=968&view=rev

Log:
	Fix for #542139 â Brasero can\'t find a proper cd/dvd drive on Solaris
	Patch by Lin Ma

	* src/burn-drive.c (brasero_drive_get_display_name),
	(brasero_drive_init_real):

Modified:
   trunk/ChangeLog
   trunk/src/burn-drive.c

Modified: trunk/src/burn-drive.c
==============================================================================
--- trunk/src/burn-drive.c	(original)
+++ trunk/src/burn-drive.c	Thu Jul 10 07:51:10 2008
@@ -43,6 +43,14 @@
 
 #include "scsi-mmc1.h"
 
+#if defined(HAVE_STRUCT_USCSI_CMD)
+#define DEVICE_MODEL	"info.product"
+#define BLOCK_DEVICE	"block.solaris.raw_device"
+#else
+#define DEVICE_MODEL	"storage.model"
+#define BLOCK_DEVICE	"block.device"
+#endif
+
 typedef struct _BraseroDrivePrivate BraseroDrivePrivate;
 struct _BraseroDrivePrivate
 {
@@ -269,7 +277,7 @@
 	ctx = brasero_drive_get_hal_context ();
 	return libhal_device_get_property_string (ctx,
 						  priv->udi,
-						  "storage.model",
+	  					  DEVICE_MODEL,
 						  NULL);
 }
 
@@ -408,7 +416,7 @@
 
 	ctx = brasero_drive_get_hal_context ();
 
-	priv->path = libhal_device_get_property_string (ctx, priv->udi, "block.device", NULL);
+	priv->path = libhal_device_get_property_string (ctx, priv->udi, BLOCK_DEVICE, NULL);
 	if (priv->path [0] == '\0') {
 		g_free (priv->path);
 		priv->path = NULL;