← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kdepimlibs/saucy-proposed

« back to all changes in this revision

Viewing changes to akonadi/kmime/util.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Scott Kitterman
  • Date: 2012-11-19 17:32:30 UTC
  • mfrom: (1.1.85)
  • Revision ID: package-import@ubuntu.com-20121119173230-xi32j2vpz82zlmmh
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release
* Remove 03_hide_akonadi_progressbar.diff now upstream
* Update .symbols file

[ Scott Kitterman ]
* Add libqjson-dev to build-depends since it is required for 4.10
* Update symbols files
* Drop FindAkonadi.cmake from debian/kdepimlibs5-dev.install since it is no
  longer provided by upstream
* Add FindQtOAuth.cmake to debian/kdepimlibs5-dev.install
* Document files we don't install in debian/NOT-INSTALLED
* Add new binary, libakonadi-socialutils4
  - Add to debian/control
  - Add to kdepimlibs metapackage depends
  - Add debian/libakonadi-socialutils4.install
  - Add debian/libakonadi-socialutils4.symbols 
* Update kdepimlibs5-dev.install for new headers for 4.10
* Add googletalkprotocol.desktop to debian/libakonadi-contact4.install
* Add missing symbols files for libakonadi-notes4 and libkalarmcal2
* Add dont_break_libkabc_abi.diff to fix ABI break - patch from José Manuel
  Santamaría Lema

Show diffs side-by-side

added added

removed removed

Lines of Context:
akonadi/kmime/util.cpp
21
21
#include "util_p.h"
22
22
#include "../dbusconnectionpool.h"
23
23
#include "imapsettings.h"
 
24
#include "akonadi/servermanager.h"
24
25
 
25
26
#include <assert.h>
26
27
#include <kio/jobclasses.h>
45
46
OrgKdeAkonadiImapSettingsInterface *createImapSettingsInterface( const QString &ident )
46
47
{
47
48
  //NOTE(Andras): from kmail/util.cpp
48
 
  return new OrgKdeAkonadiImapSettingsInterface( QString::fromLatin1("org.freedesktop.Akonadi.Resource.") + ident,
 
49
  return new OrgKdeAkonadiImapSettingsInterface( Akonadi::ServerManager::agentServiceName( Akonadi::ServerManager::Resource, ident ),
49
50
                                                 QString::fromLatin1("/Settings"),
50
51
                                                 Akonadi::DBusConnectionPool::threadConnection() );
51
52
}