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/detect-media-types.patch | |
| 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/detect-media-types.patch')
| -rw-r--r-- | mandriva/2010.2/kdebase/detect-media-types.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdebase/detect-media-types.patch b/mandriva/2010.2/kdebase/detect-media-types.patch new file mode 100644 index 000000000..85c1c771b --- /dev/null +++ b/mandriva/2010.2/kdebase/detect-media-types.patch @@ -0,0 +1,33 @@ +--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 15:59:27.725473830 +0000 ++++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:00:30.800473078 +0000 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + #include <locale.h> +@@ -586,19 +585,12 @@ + medium->setIconName(TQString::null); + + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) +- { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; +- } + } + else + { |