← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to plasma/abstractrunner.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/abstractrunner.cpp
132
132
{
133
133
}
134
134
 
135
 
void AbstractRunner::performMatch(Plasma::RunnerContext &globalContext)
 
135
void AbstractRunner::performMatch(Plasma::RunnerContext &localContext)
136
136
{
137
137
    static const int reasonableRunTime = 1500;
138
138
    static const int fastEnoughTime = 250;
139
139
 
140
140
    d->runtime.restart();
141
 
//TODO :this is a copy ctor
142
 
    RunnerContext localContext(globalContext, 0);
 
141
    
143
142
    match(localContext);
144
143
    // automatically rate limit runners that become slooow
145
144
    const int runtime = d->runtime.elapsed();
153
152
        setSpeed(SlowSpeed);
154
153
    }
155
154
 
156
 
    //If matches were not added, delete items on the heap
157
 
    if (slowed && runtime < fastEnoughTime) {
 
155
     if (slowed && runtime < fastEnoughTime && localContext.query().size() > 2) {
158
156
        ++d->fastRuns;
159
157
 
160
158
        if (d->fastRuns > 2) {