D6410: Pimcommon: fix manage serverside subscription for Akonadi instances

[Allen Winter]

winterz created this revision.
Restricted Application added a project: KDE PIM.
Restricted Application added a subscriber: KDE PIM.

REVISION SUMMARY
  This patch fixes the service name if you are using an Akonadi server instance.   The patch appends the instance name to the service name in such cases.
  
  I also couldn't help myself and did a minor cleaning on the includes

TEST PLAN
  ran kontact with an akonadi instance and now I can see the manager serverside subscription dialog

REPOSITORY
  R95 PIM: Common Support

REVISION DETAIL
  https://phabricator.kde.org/D6410

AFFECTED FILES
  src/pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp

To: winterz, dvratil, dfaure
Cc: #kde_pim, dvasin, winterz, vkrause, mlaurent, knauss, dvratil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20170627/e1e6d76f/attachment.html>