rpms/pcmanfm/devel pcmanfm-0.3.5.23-fix-crash-on-mount.patch, NONE, 1.1 pcmanfm.spec, 1.1, 1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32676/devel

Modified Files:
	pcmanfm.spec 
Added Files:
	pcmanfm-0.3.5.23-fix-crash-on-mount.patch 
Log Message:
* Tue Feb 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.5.23-3
- Fix crash on mounting removable devices


pcmanfm-0.3.5.23-fix-crash-on-mount.patch:

--- NEW FILE pcmanfm-0.3.5.23-fix-crash-on-mount.patch ---
--- pcmanfm-0.3.5.23/src/vfs/vfs-volume-hal.c.debug	2008-02-13 13:57:17.000000000 +0900
+++ pcmanfm-0.3.5.23/src/vfs/vfs-volume-hal.c	2008-02-19 18:49:29.000000000 +0900
@@ -292,7 +292,7 @@
                                                                                    const gchar                    *details);
 
 
-static call_callbacks( VFSVolume* vol, VFSVolumeState state )
+static void call_callbacks( VFSVolume* vol, VFSVolumeState state )
 {
     int i;
     VFSVolumeCallbackData* e;
@@ -2461,11 +2461,14 @@
     if( mount_point )
     {
         char* pmp = mount_point;
+        char* _mount_point;
         for ( ;*pmp; ++pmp) {
             if (*pmp == G_DIR_SEPARATOR) {
                 *pmp = '_';
             }
         }
+       _mount_point= g_strdup(mount_point);
+       mount_point = _mount_point;
     }
     else
         mount_point = g_strdup ("");


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcmanfm.spec	18 Feb 2008 18:11:29 -0000	1.1
+++ pcmanfm.spec	19 Feb 2008 10:08:50 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		pcmanfm
 Version:	0.3.5.23
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -11,7 +11,8 @@
 URL:		http://pcmanfm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 Patch0:		pcmanfm-0.3.5.23-crash-on-64bits.patch
-Patch1:		pcmanfm-0.3.5.23-disable-mount-removable-device.patch
+#Patch1:		pcmanfm-0.3.5.23-disable-mount-removable-device.patch
+Patch2:		pcmanfm-0.3.5.23-fix-crash-on-mount.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-glib-devel
@@ -30,7 +31,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .64bits
-%patch1 -p1 -b .mount
+#%%patch1 -p1 -b .mount
+%patch2 -p1 -b .mount
 
 # permission fix
 %{__chmod} 0644 \
@@ -94,6 +96,9 @@
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Tue Feb 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.5.23-3
+- Fix crash on mounting removable devices
+
 * Mon Feb 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.5.23-2
 - Apply patch to fix crash on 64bits arch as suggested by Hans
   (bug 433182)