← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to plasma/runnermanager.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Thomas, Jonathan Thomas, Philip Muškovac
  • Date: 2012-05-24 19:52:02 UTC
  • mfrom: (1.14.18)
  • Revision ID: package-import@ubuntu.com-20120524195202-uce4f041j1cp6qz7
Tags: 4:4.8.80a-0ubuntu1
[ Jonathan Thomas ]
* New upstream beta release:
  - Update symbols files for new symbols
* Merge with Debian git, remaining changes:
  - no build-dep on libaspell-dev
  - no build-dep on libfam-dev
  - kdelibs5-data: don't install kspell_aspell.desktop
  - kdelibs5-plugins: don't install  usr/lib/kde4/kspell_aspell.so
  - kdelibs5-dev: don't install preparetips
  - Pass -DKDESU_USE_SUDO_DEFAULT=true to configure
  - dh_fixperms: exclude /usr/lib/kde4/libexec/fileshareset
  - don't apply use_dejavu_as_default_font.diff
  - don't apply kconf_update_migrate_from_kde3_icon_theme.diff
    - kdelibs5-plugins.install:
      drop usr/share/kde4/apps/kconf_update/kdeui.upd
      and migrate_from_kde3_icon_theme
  - don't build depend on libglu1-mesa-dev, not needed due to
    kubuntu_no_direct_gl_usage.diff
  - kdelibs5-plugins: recommend ttf-dejavu-core instead of ttf-dejavu to save
    CD space.

[ Philip Muškovac ]
* Add support to cmake/modules/PythonMacros.cmake for the environment
  variable $PYTHONDONTWRITEBYTECODE to work around the lack of support for
  Python 3 byte code compilation
  - Added in debian/patches/python3-support-bytecode.patch
  - Thanks to Colin Watson for the patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/runnermanager.cpp
252
252
            }
253
253
        }
254
254
 
 
255
        if (!singleRunnerWasLoaded) {
 
256
            // in case we deleted it up above
 
257
            clearSingleRunner();
 
258
        }
 
259
 
255
260
        kDebug() << "All runners loaded, total:" << runners.count();
256
261
    }
257
262
 
811
816
        qDeleteAll(d->oldSearchJobs);
812
817
        d->oldSearchJobs.clear();
813
818
    } else {
814
 
        Weaver::instance()->dequeue();
 
819
        Q_FOREACH(FindMatchesJob *job, d->searchJobs) {
 
820
            Weaver::instance()->dequeue(job);
 
821
        }
815
822
        d->oldSearchJobs += d->searchJobs;
816
823
    }
817
824