diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-10-14 23:31:33 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-10-14 23:31:33 -0500 |
commit | d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b (patch) | |
tree | 86eec4e4a0f6ba88cc7e6fab9ec926bc93d72396 /mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff | |
parent | f63b035a91cf5baff629f5e5dee4aeb7efe8d57b (diff) | |
parent | ec2515f058c60d2478a549f58376db628ba556b9 (diff) | |
download | tde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.tar.gz tde-packaging-d2587a8509c0e15c38d99fb4bcfa2b2fc3209e9b.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff')
-rw-r--r-- | mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff b/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff new file mode 100644 index 000000000..553ad464c --- /dev/null +++ b/mandriva/2010.2/kdebase/mediamanager-mount-point-utf8.diff @@ -0,0 +1,11 @@ +--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 16:20:42.266474457 +0000 ++++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:21:33.580473069 +0000 +@@ -520,7 +520,7 @@ + medium->mountableState( + libhal_volume_get_device_file(halVolume), /* Device node */ + clearUdiString, +- libhal_volume_get_mount_point(halClearVolume), /* Mount point */ ++ TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)), /* Mount point */ + libhal_volume_get_fstype(halClearVolume), /* Filesystem type */ + libhal_volume_is_mounted(halClearVolume) ); /* Mounted ? */ + else |