aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp')
-rw-r--r--x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp50
1 files changed, 50 insertions, 0 deletions
diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
new file mode 100644
index 000000000000..98bb0c705950
--- /dev/null
+++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
@@ -0,0 +1,50 @@
+--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006
++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006
+@@ -17,7 +17,6 @@
+ */
+
+ #include "halbackend.h"
+-#include "linuxcdpolling.h"
+
+ #include <stdlib.h>
+
+@@ -469,28 +468,23 @@
+ else
+ mimeType = "media/dvd" + MOUNT_SUFFIX;
+
+- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
+- {
+- mimeType = "media/audiocd";
+- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) );
+- }
+-
+- medium->setIconName(QString::null);
+-
+ /* check if the disc id a vcd or a video dvd */
+- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
+- switch (type)
++ if (libhal_volume_disc_has_data(halVolume))
+ {
+- 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 if (libhal_volume_disc_has_audio(halVolume))
++ {
++ mimeType = "media/audiocd";
++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) );
++ }
++
++ medium->setIconName(QString::null);
+ }
+ else
+ {