[Xfce4-commits] <xfburn:master> uint screwed up the -1 return

[David Mohr]

Updating branch refs/heads/master
         to f4e2afea91a05b3ae05960a3c799952810a105e8 (commit)
       from c04850b00452c43d18615faa6dfb023e5c5184e7 (commit)

commit f4e2afea91a05b3ae05960a3c799952810a105e8
Author: David Mohr <squisher at xfce.org>
Date:   Wed Nov 11 20:26:35 2009 -0700

    uint screwed up the -1 return

 NEWS                        |    3 +++
 xfburn/xfburn-device-list.c |    9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 4237fe6..89c268b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
 xfburn 0.4.3 (2009-XX-XX)
 ============-------------
 
+- Fall back gracefully to use libburn when compiled with HAL support but 
+  when the HAL daemon is not running.
 - Again show the volume name in the burn dialog if it has the default value
+- By default let libburn autodetect the write mode
 
 xfburn 0.4.2 (2009-07-23)
 ============-------------
diff --git a/xfburn/xfburn-device-list.c b/xfburn/xfburn-device-list.c
index 2318e46..4a431d7 100644
--- a/xfburn/xfburn-device-list.c
+++ b/xfburn/xfburn-device-list.c
@@ -46,8 +46,8 @@ typedef struct _XfburnDeviceListPrivate XfburnDeviceListPrivate;
 
 struct _XfburnDeviceListPrivate {
   GList *devices;
-  guint num_drives;
-  guint num_burners;
+  gint num_drives;
+  gint num_burners;
   XfburnDevice *curr_device;
 
 #ifdef HAVE_HAL
@@ -300,12 +300,15 @@ get_libburn_device_list (XfburnDeviceList *devlist)
   struct burn_drive_info *drives;
   guint i;
   gint ret; 
+  guint num_drives;
 
   DBG ("Before scanning for drives");
-  while ((ret = burn_drive_scan (&drives, &(priv->num_drives))) == 0)
+  while ((ret = burn_drive_scan (&drives, &(num_drives))) == 0)
     usleep (1002);
   DBG ("After scanning for drives");
 
+  priv->num_drives = (gint) num_drives;
+
   if (ret < 0)
     g_warning ("An error occurred while scanning for available drives");