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

[David Mohr]

Author: squisher
Date: 2008-04-25 18:27:13 +0000 (Fri, 25 Apr 2008)
New Revision: 4675

Modified:
   xfburn/trunk/xfburn/xfburn-device-box.c
   xfburn/trunk/xfburn/xfburn-device-list.c
   xfburn/trunk/xfburn/xfburn-device-list.h
Log:
Adding error message when unable to grab drive (program aborted before)

Modified: xfburn/trunk/xfburn/xfburn-device-box.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-box.c	2008-04-25 05:13:42 UTC (rev 4674)
+++ xfburn/trunk/xfburn/xfburn-device-box.c	2008-04-25 18:27:13 UTC (rev 4675)
@@ -496,6 +496,9 @@
         case BURN_DISC_UNSUITABLE:
           gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Inserted disc is unsuitable!</span>"));
           break;
+        case BURN_DISC_UNGRABBED:
+          gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">No access to drive (mounted?)</span>"));
+          break;
         default:
           gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Error determining disc!</span>"));
           DBG ("weird disc_status = %d", disc_status);
@@ -515,6 +518,9 @@
         case BURN_DISC_UNSUITABLE:
           gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Inserted disc is unsuitable!</span>"));
           break;
+        case BURN_DISC_UNGRABBED:
+          gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">No access to drive (mounted?)</span>"));
+          break;
         default:
           gtk_label_set_markup (GTK_LABEL(priv->status_label), _("<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Error determining disc!</span>"));
           DBG ("weird disc_status = %d", disc_status);

Modified: xfburn/trunk/xfburn/xfburn-device-list.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-list.c	2008-04-25 05:13:42 UTC (rev 4674)
+++ xfburn/trunk/xfburn/xfburn-device-list.c	2008-04-25 18:27:13 UTC (rev 4675)
@@ -169,26 +169,31 @@
   return disc_status;
 }
 
-void
+gboolean
 xfburn_device_refresh_supported_speeds (XfburnDevice * device)
 {
   struct burn_drive_info *drive_info = NULL;
+  gboolean ret;
 
   if (!burn_initialize ()) {
     g_critical ("Unable to initialize libburn");
-    return;
+    return FALSE;
   }
 
   if (!xfburn_device_grab (device, &drive_info)) {
-    g_error ("Couldn't grab drive in order to update speed list.");
-    return;
+    ret = FALSE;
+    g_warning ("Couldn't grab drive in order to update speed list.");
+    disc_status = BURN_DISC_UNGRABBED;
+  } else {
+    ret = TRUE;
+    refresh_supported_speeds (device, drive_info);
+
+    burn_drive_release (drive_info->drive, 0);
   }
 
-  refresh_supported_speeds (device, drive_info);
+  burn_finish ();
 
-  burn_drive_release (drive_info->drive, 0);
-
-  burn_finish ();
+  return ret;
 }
 
 gint

Modified: xfburn/trunk/xfburn/xfburn-device-list.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-list.h	2008-04-25 05:13:42 UTC (rev 4674)
+++ xfburn/trunk/xfburn/xfburn-device-list.h	2008-04-25 18:27:13 UTC (rev 4675)
@@ -54,7 +54,7 @@
 enum burn_disc_status xfburn_device_list_get_disc_status ();
 void xfburn_device_list_free ();
 
-void xfburn_device_refresh_supported_speeds (XfburnDevice * device);
+gboolean xfburn_device_refresh_supported_speeds (XfburnDevice * device);
 gboolean xfburn_device_grab (XfburnDevice * device, struct burn_drive_info **drive_info);
 void xfburn_device_free (XfburnDevice * device);