[Goodies-commits] r5362 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2008-09-06 04:26:40 +0000 (Sat, 06 Sep 2008)
New Revision: 5362

Modified:
   xfburn/trunk/xfburn/xfburn-device-box.c
   xfburn/trunk/xfburn/xfburn-hal-manager.c
Log:
 * Handle an empty drive correctly with HAL
 * Notify the user that appendable discs can't get used yet for burning


Modified: xfburn/trunk/xfburn/xfburn-device-box.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-box.c	2008-09-05 22:51:48 UTC (rev 5361)
+++ xfburn/trunk/xfburn/xfburn-device-box.c	2008-09-06 04:26:40 UTC (rev 5362)
@@ -632,6 +632,9 @@
           case BURN_DISC_EMPTY:
             priv->status_text = _("Drive is empty!");
             break;
+          case BURN_DISC_APPENDABLE:
+            priv->status_text = _("Sorry, multisession is not yet supported!");
+            break;
           case BURN_DISC_FULL:
             priv->status_text = _("Inserted disc is full!");
             break;

Modified: xfburn/trunk/xfburn/xfburn-hal-manager.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-09-05 22:51:48 UTC (rev 5361)
+++ xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-09-06 04:26:40 UTC (rev 5362)
@@ -219,10 +219,10 @@
 static void cb_prop_modified (LibHalContext *ctx, const char *udi,
                               const char *key, dbus_bool_t is_removed, dbus_bool_t is_added)
 {
+  DBG ("HAL: property modified");
   /* Lets ignore this for now,
    * way too many of these get triggered when a disc is
    * inserted or removed!
-  DBG ("HAL: property modified");
   g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
   */
 }
@@ -470,8 +470,8 @@
   
   vol = libhal_volume_from_device_file (priv->hal_context, device->addr);
   if (vol == NULL) {
-    g_warning ("Could not get HAL volume for %s!", device->addr);
-    return FALSE;
+    /* if we can't get a volume, then we're assuming that there is no disc in the drive */
+    return TRUE;
   }
 
   if (!libhal_volume_is_mounted (vol))