rpms/Thunar/F-8 thunar-vfs-audio-cd-fix.patch, NONE, 1.1 Thunar.spec, 1.10, 1.11 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Mon Dec 10 19:09:29 UTC 2007
Author: kevin
Update of /cvs/extras/rpms/Thunar/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15473
Modified Files:
Thunar.spec sources .cvsignore
Added Files:
thunar-vfs-audio-cd-fix.patch
Log Message:
Add thunar-vfs patch.
Update to 0.9.0
thunar-vfs-audio-cd-fix.patch:
--- NEW FILE thunar-vfs-audio-cd-fix.patch ---
diff -Nur Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c
--- Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-02 06:46:33.000000000 -0700
+++ Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c 2007-12-05 18:48:31.000000000 -0700
@@ -1007,9 +1007,7 @@
hv = libhal_volume_from_udi (context, udi);
/* HAL might want us to ignore this volume for some reason */
- if (G_UNLIKELY (hv != NULL
- && (libhal_volume_should_ignore (hv)
- || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
+ if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
{
libhal_volume_free (hv);
return;
@@ -1020,38 +1018,42 @@
if (G_LIKELY (hv != NULL))
{
- /* determine the UDI of the drive to which this volume belongs */
- drive_udi = libhal_volume_get_storage_device_udi (hv);
- if (G_LIKELY (drive_udi != NULL))
+ /* check if we have a mountable file system here */
+ if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
{
- /* determine the drive for the volume */
- hd = libhal_drive_from_udi (context, drive_udi);
- if (G_LIKELY (hd != NULL))
+ /* determine the UDI of the drive to which this volume belongs */
+ drive_udi = libhal_volume_get_storage_device_udi (hv);
+ if (G_LIKELY (drive_udi != NULL))
{
- /* check if we already have a volume object for the UDI */
- volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
- if (G_LIKELY (volume_hal == NULL))
+ /* determine the drive for the volume */
+ hd = libhal_drive_from_udi (context, drive_udi);
+ if (G_LIKELY (hd != NULL))
{
- /* otherwise, we allocate a new volume object */
- volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
- volume_hal->udi = g_strdup (udi);
- }
-
- /* update the volume object with the new data from the HAL volume/drive */
- thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
+ /* check if we already have a volume object for the UDI */
+ volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
+ if (G_LIKELY (volume_hal == NULL))
+ {
+ /* otherwise, we allocate a new volume object */
+ volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
+ volume_hal->udi = g_strdup (udi);
+ }
+
+ /* update the volume object with the new data from the HAL volume/drive */
+ thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
+
+ /* add the volume object to our list if we allocated a new one */
+ if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
+ {
+ /* add the volume to the volume manager */
+ thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
+
+ /* release the reference on the volume */
+ g_object_unref (G_OBJECT (volume_hal));
+ }
- /* add the volume object to our list if we allocated a new one */
- if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
- {
- /* add the volume to the volume manager */
- thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
-
- /* release the reference on the volume */
- g_object_unref (G_OBJECT (volume_hal));
+ /* release the HAL drive */
+ libhal_drive_free (hd);
}
-
- /* release the HAL drive */
- libhal_drive_free (hd);
}
}
Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-8/Thunar.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Thunar.spec 27 Aug 2007 19:36:32 -0000 1.10
+++ Thunar.spec 10 Dec 2007 19:08:56 -0000 1.11
@@ -1,10 +1,11 @@
Summary: Thunar File Manager
Name: Thunar
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.9.0
+Release: 2%{?dist}
License: GPLv2+
URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.0/src/Thunar-0.8.0.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.4.2/src/Thunar-0.9.0.tar.bz2
+Patch0: thunar-vfs-audio-cd-fix.patch
Group: User Interface/Desktops
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fam-devel
@@ -53,6 +54,7 @@
%prep
%setup -q
+%patch0 -p1 -b .vfs-fix
%build
%configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
@@ -170,6 +172,12 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Dec 3 2007 Kevin Fenzi <kevin at tummy.com> - 0.9.0-2
+- Add thunar-vfs patch.
+
+* Sun Dec 2 2007 Kevin Fenzi <kevin at tummy.com> - 0.9.0-1
+- Update to 0.9.0
+
* Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> - 0.8.0-3
- Update License tag
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jan 2007 08:39:24 -0000 1.4
+++ sources 10 Dec 2007 19:08:56 -0000 1.5
@@ -1 +1 @@
-9f7b0945d6a235391049f6818fb4d188 Thunar-0.8.0.tar.bz2
+0fc5008858661c0abd0399acbe30ef28 Thunar-0.9.0.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 22 Jan 2007 08:39:24 -0000 1.4
+++ .cvsignore 10 Dec 2007 19:08:56 -0000 1.5
@@ -1 +1 @@
-Thunar-0.8.0.tar.bz2
+Thunar-0.9.0.tar.bz2
More information about the scm-commits
mailing list