| 1 |
drac 07/12/03 16:57:40 |
| 2 |
|
| 3 |
Added: thunar-0.9.0-missing-audio-cds-for-volman.patch |
| 4 |
digest-thunar-0.9.0-r1 |
| 5 |
Log: |
| 6 |
Upstream patch to fix audio cd support with thunar-volman. |
| 7 |
(Portage version: 2.1.4_rc4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: thunar-0.9.0-missing-audio-cds-for-volman.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c |
| 18 |
--- Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-02 15:46:33.000000000 +0200 |
| 19 |
+++ Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-03 18:45:48.000000000 +0200 |
| 20 |
@@ -1007,9 +1007,7 @@ |
| 21 |
hv = libhal_volume_from_udi (context, udi); |
| 22 |
|
| 23 |
/* HAL might want us to ignore this volume for some reason */ |
| 24 |
- if (G_UNLIKELY (hv != NULL |
| 25 |
- && (libhal_volume_should_ignore (hv) |
| 26 |
- || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM))) |
| 27 |
+ if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv))) |
| 28 |
{ |
| 29 |
libhal_volume_free (hv); |
| 30 |
return; |
| 31 |
@@ -1020,38 +1018,42 @@ |
| 32 |
|
| 33 |
if (G_LIKELY (hv != NULL)) |
| 34 |
{ |
| 35 |
- /* determine the UDI of the drive to which this volume belongs */ |
| 36 |
- drive_udi = libhal_volume_get_storage_device_udi (hv); |
| 37 |
- if (G_LIKELY (drive_udi != NULL)) |
| 38 |
+ /* check if we have a mountable file system here */ |
| 39 |
+ if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM) |
| 40 |
{ |
| 41 |
- /* determine the drive for the volume */ |
| 42 |
- hd = libhal_drive_from_udi (context, drive_udi); |
| 43 |
- if (G_LIKELY (hd != NULL)) |
| 44 |
+ /* determine the UDI of the drive to which this volume belongs */ |
| 45 |
+ drive_udi = libhal_volume_get_storage_device_udi (hv); |
| 46 |
+ if (G_LIKELY (drive_udi != NULL)) |
| 47 |
{ |
| 48 |
- /* check if we already have a volume object for the UDI */ |
| 49 |
- volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi); |
| 50 |
- if (G_LIKELY (volume_hal == NULL)) |
| 51 |
+ /* determine the drive for the volume */ |
| 52 |
+ hd = libhal_drive_from_udi (context, drive_udi); |
| 53 |
+ if (G_LIKELY (hd != NULL)) |
| 54 |
{ |
| 55 |
- /* otherwise, we allocate a new volume object */ |
| 56 |
- volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL); |
| 57 |
- volume_hal->udi = g_strdup (udi); |
| 58 |
- } |
| 59 |
- |
| 60 |
- /* update the volume object with the new data from the HAL volume/drive */ |
| 61 |
- thunar_vfs_volume_hal_update (volume_hal, context, hv, hd); |
| 62 |
+ /* check if we already have a volume object for the UDI */ |
| 63 |
+ volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi); |
| 64 |
+ if (G_LIKELY (volume_hal == NULL)) |
| 65 |
+ { |
| 66 |
+ /* otherwise, we allocate a new volume object */ |
| 67 |
+ volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL); |
| 68 |
+ volume_hal->udi = g_strdup (udi); |
| 69 |
+ } |
| 70 |
+ |
| 71 |
+ /* update the volume object with the new data from the HAL volume/drive */ |
| 72 |
+ thunar_vfs_volume_hal_update (volume_hal, context, hv, hd); |
| 73 |
+ |
| 74 |
+ /* add the volume object to our list if we allocated a new one */ |
| 75 |
+ if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL) |
| 76 |
+ { |
| 77 |
+ /* add the volume to the volume manager */ |
| 78 |
+ thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal)); |
| 79 |
+ |
| 80 |
+ /* release the reference on the volume */ |
| 81 |
+ g_object_unref (G_OBJECT (volume_hal)); |
| 82 |
+ } |
| 83 |
|
| 84 |
- /* add the volume object to our list if we allocated a new one */ |
| 85 |
- if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL) |
| 86 |
- { |
| 87 |
- /* add the volume to the volume manager */ |
| 88 |
- thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal)); |
| 89 |
- |
| 90 |
- /* release the reference on the volume */ |
| 91 |
- g_object_unref (G_OBJECT (volume_hal)); |
| 92 |
+ /* release the HAL drive */ |
| 93 |
+ libhal_drive_free (hd); |
| 94 |
} |
| 95 |
- |
| 96 |
- /* release the HAL drive */ |
| 97 |
- libhal_drive_free (hd); |
| 98 |
} |
| 99 |
} |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.1 xfce-base/thunar/files/digest-thunar-0.9.0-r1 |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/thunar/files/digest-thunar-0.9.0-r1?rev=1.1&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/thunar/files/digest-thunar-0.9.0-r1?rev=1.1&content-type=text/plain |
| 108 |
|
| 109 |
Index: digest-thunar-0.9.0-r1 |
| 110 |
=================================================================== |
| 111 |
MD5 0fc5008858661c0abd0399acbe30ef28 Thunar-0.9.0.tar.bz2 6403785 |
| 112 |
RMD160 ebb744aa107d4def06c8c805ee6936d1acf2d4d7 Thunar-0.9.0.tar.bz2 6403785 |
| 113 |
SHA256 26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 Thunar-0.9.0.tar.bz2 6403785 |
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
-- |
| 118 |
gentoo-commits@g.o mailing list |
Archives