[Goodies-commits] r5286 - in xfburn/trunk: . xfburn

[David Mohr]

Author: squisher
Date: 2008-08-22 05:28:00 +0000 (Fri, 22 Aug 2008)
New Revision: 5286

Modified:
   xfburn/trunk/README
   xfburn/trunk/xfburn/xfburn-hal-manager.c
   xfburn/trunk/xfburn/xfburn-main.c
Log:
Fixing compilation without thunar-vfs

Modified: xfburn/trunk/README
===================================================================
--- xfburn/trunk/README	2008-08-22 05:20:23 UTC (rev 5285)
+++ xfburn/trunk/README	2008-08-22 05:28:00 UTC (rev 5286)
@@ -32,12 +32,17 @@
  * libisofs version 0.6.2 or newer
  * libburn version 0.4.2 or newer
 
-Optional:
- * thunar-vfs (highly recommended, required for some drag and drop code,
-               icons and automatic disc unmounting)
+Optional, but highly recommended
+--------------------------------
  * hal        (required for notification of disc eject / insert and
                also for automatic disc unmounting)
+ * thunar-vfs (required for some drag and drop code, icons and automatic disc 
+               unmounting)
 
+The author works with both hal and thunar-vfs enabled, so there might be the
+occasional bug that breaks compilation without these components.  Please
+report a bug, and it will get fixed.
+
 ==============================================================================
 Future Plans
 ------------

Modified: xfburn/trunk/xfburn/xfburn-hal-manager.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-08-22 05:20:23 UTC (rev 5285)
+++ xfburn/trunk/xfburn/xfburn-hal-manager.c	2008-08-22 05:28:00 UTC (rev 5286)
@@ -459,11 +459,13 @@
 {
   XfburnHalManagerPrivate *priv = XFBURN_HAL_MANAGER_GET_PRIVATE (halman);
   LibHalVolume *vol;
+#ifdef HAVE_THUNAR_VFS
   const char *mp;
   ThunarVfsInfo *th_info;
   ThunarVfsVolumeManager *th_volman;
   ThunarVfsVolume *th_vol;
   ThunarVfsPath *th_path;
+#endif
   gboolean unmounted = FALSE;
   
   vol = libhal_volume_from_device_file (priv->hal_context, device->addr);

Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c	2008-08-22 05:20:23 UTC (rev 5285)
+++ xfburn/trunk/xfburn/xfburn-main.c	2008-08-22 05:28:00 UTC (rev 5286)
@@ -180,7 +180,9 @@
   error_msg = xfburn_hal_manager_create_global ();
   if (error_msg) {
     xfce_err (error_msg);
+#ifdef HAVE_THUNAR_VFS
     thunar_vfs_shutdown ();
+#endif
     gdk_threads_leave ();
     return EXIT_FAILURE;
   }