← Back to branch summary

~ubuntu-branches/ubuntu/quantal/digikam/quantal-proposed

« back to all changes in this revision

Viewing changes to core/libs/database/collectionmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-06-08 00:31:19 UTC
  • mfrom: (1.2.39) (3.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20120608003119-qn0l1eo3rf5jdh9w
Tags: 4:2.6.0-0ubuntu1
https://launchpad.net/bugs/885324
https://launchpad.net/bugs/1009943
* Merge from debian, remaining changes (LP: #885324, #1009943)
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
  - digikam-doc breaks/replaces digikam-data << 4:2.5.0~
  - digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
  - kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~
* Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/database/collectionmanager.cpp
277
277
    else
278
278
    {
279
279
        // emit a blocking queued signal to move call to main thread
280
 
        emit s->triggerUpdateVolumesList();
 
280
        emit(s->triggerUpdateVolumesList());
281
281
        return volumesListCache;
282
282
    }
283
283
}