diff options
author | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
commit | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch) | |
tree | 2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/tdebase/media_suse.diff | |
parent | 8667643bff14a60d8571c599efd3e48bed3e3b12 (diff) | |
download | tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip |
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/tdebase/media_suse.diff')
-rw-r--r-- | opensuse/tdebase/media_suse.diff | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/opensuse/tdebase/media_suse.diff b/opensuse/tdebase/media_suse.diff deleted file mode 100644 index 8583f03d2..000000000 --- a/opensuse/tdebase/media_suse.diff +++ /dev/null @@ -1,49 +0,0 @@ -Index: kioslave/media/mediamanager/halbackend.cpp -=================================================================== ---- kioslave/media/mediamanager/halbackend.cpp.orig -+++ kioslave/media/mediamanager/halbackend.cpp -@@ -248,14 +248,15 @@ void HALBackend::AddDevice(const char *u - return; - } - } -+ m_mediaList.addMedium(medium, allowNotification); -+ - QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -+ if (options["automount"] == "true" ) { - QString error = mount(medium); - if (!error.isEmpty()) - kdDebug() << "error " << error << endl; - } -- m_mediaList.addMedium(medium, allowNotification); - - return; - } -@@ -292,6 +293,12 @@ void HALBackend::AddDevice(const char *u - m_mediaList.addMedium(medium, allowNotification); - return; - } -+ -+ if ( allowNotification ) { -+ KProcess proc; -+ proc << "suseplugger" << udi; -+ proc.start(KProcess::DontCare); -+ } - } - - void HALBackend::RemoveDevice(const char *udi) -@@ -816,8 +823,12 @@ QStringList HALBackend::mountoptions(con - removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) - || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); - -+ bool value = removable; -+ QString drive_type = libhal_device_get_property_QString( m_halContext, drive_udi.latin1(), "storage.drive_type" ); -+ value |= ( drive_type == "cdrom" ); -+ - config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -+ value = config.readBoolEntry("automount", value); - config.setGroup(name); - - if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) |