← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-workspace/precise-security

« back to all changes in this revision

Viewing changes to plasma/generic/dataengines/hotplug/hotplugengine.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Scott Kitterman, Jonathan Riddell
  • Date: 2012-09-07 18:06:44 UTC
  • mfrom: (0.1.1) (1.1.14)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: package-import@ubuntu.com-20120907180644-ye0r2bakv7nsd4tl
Tags: 4:4.8.5-0ubuntu0.1
https://launchpad.net/bugs/1047417
[ Scott Kitterman ]
* New upstream bugfix release (LP: #1047417)
   - Drop patches previously cherrypicked from upstream:
      Remove_second_invisible_ProcessTable_widget.patch
      Fix_regression_that_you_couldnt_add_new_beams.patch
      Prevent_user_from_hiding_all_columns.patch
      observe_polkit_privileges_with_CanSuspend_CanResume.diff

[ Jonathan Riddell ]
* Add kde-workspace_4.8.5.orig-ksplash.tar.gz with ariya theme
  which was missed from tar by upsteram
* Add kubuntu_remove_horos_ksplash_theme.diff to remove horos theme

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/generic/dataengines/hotplug/hotplugengine.cpp
37
37
#include <Solid/DeviceInterface>
38
38
#include <Solid/StorageDrive>
39
39
#include <Solid/StorageVolume>
 
40
#include <Solid/OpticalDisc>
40
41
 
41
42
//#define HOTPLUGENGINE_TIMING
42
43
 
191
192
        Solid::DeviceInterface *dev = device.asDeviceInterface(Solid::DeviceInterface::StorageVolume);
192
193
        Solid::StorageVolume *volume = static_cast<Solid::StorageVolume *>(dev);
193
194
        Solid::StorageVolume::UsageType type = volume->usage();
194
 
        if (type == Solid::StorageVolume::Unused ||
195
 
            type == Solid::StorageVolume::PartitionTable) {
 
195
        if ((type == Solid::StorageVolume::Unused ||
 
196
             type == Solid::StorageVolume::PartitionTable) && !device.is<Solid::OpticalDisc>()) {
196
197
#ifdef HOTPLUGENGINE_TIMING
197
198
            kDebug() << "storage volume, but not of interest" << t.restart();
198
199
#endif