← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdebase-workspace/maverick-proposed

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-08 01:11:52 UTC
  • mfrom: (1.1.43 upstream)
  • Revision ID: james.westby@ubuntu.com-20100708011152-z0h26httnjr91mmy
Tags: 4:4.4.92-0ubuntu1
* New upstream rc release:
  - Bump kde-sc-dev-latest to 4.4.92
  - Refresh patches
  - Update symbols
  - plasma-widgets-workspace replaces/conflicts plasma-widget-logout

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/generic/dataengines/hotplug/hotplugengine.cpp
126
126
 
127
127
        QStringList predicates = predicatesForDevice(device);
128
128
        if (!predicates.isEmpty()) {
129
 
            Plasma::DataEngine::Data data;
130
 
            data.insert("predicateFiles", predicates);
 
129
            if (sources().contains(udi)) {
 
130
                Plasma::DataEngine::Data data;
 
131
                data.insert("predicateFiles", predicates);
131
132
 
132
 
            setData(udi, data);
133
 
        } else if (sources().contains(udi)) {
 
133
                setData(udi, data);
 
134
            } else {
 
135
                onDeviceAdded(device, false);
 
136
            }
 
137
        } else if (!m_encryptedPredicate.matches(device) && sources().contains(udi)) {
134
138
            removeSource(udi);
135
139
            scheduleSourcesUpdated();
136
140
        }