wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix api

Browse Source
wilder
Laurent Montel 6 years ago
parent 60a197c855
commit e39079b55c
2 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 16
      src/kmreaderwin.cpp

2
CMakeLists.txt
Unescape View File

@ -44,7 +44,7 @@ set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSI
set(AKONADI_MIMELIB_VERSION "5.14.43") set(AKONADI_MIMELIB_VERSION "5.14.43")
set(AKONADI_CONTACT_VERSION "5.14.40") set(AKONADI_CONTACT_VERSION "5.14.41")
set(CALENDARUTILS_LIB_VERSION "5.14.40") set(CALENDARUTILS_LIB_VERSION "5.14.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.40") set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.40")
set(KLDAP_LIB_VERSION "5.14.41") set(KLDAP_LIB_VERSION "5.14.41")

16
src/kmreaderwin.cpp
Unescape View File

@ -31,9 +31,9 @@
#include "kmail-version.h" #include "kmail-version.h"
#include <KEmailAddress> #include <KEmailAddress>
#include <LibkdepimAkonadi/AddEmailAddressJob> #include <Akonadi/Contact/AddEmailAddressJob>
#include <LibkdepimAkonadi/OpenEmailAddressJob> #include <Akonadi/Contact/OpenEmailAddressJob>
#include <LibkdepimAkonadi/AddEmailDisplayJob> #include <Akonadi/Contact/AddEmailDisplayJob>
#include <PimCommon/BroadcastStatus> #include <PimCommon/BroadcastStatus>
#include "kmcommands.h" #include "kmcommands.h"
#include <MailCommon/SendMdnHandler> #include <MailCommon/SendMdnHandler>
@ -454,9 +454,9 @@ void KMReaderWin::slotMailtoAddAddrBook()
} }
const QString emailString = KEmailAddress::decodeMailtoUrl(url); const QString emailString = KEmailAddress::decodeMailtoUrl(url);
KPIM::AddEmailAddressJob *job = new KPIM::AddEmailAddressJob(emailString, mMainWindow, this); Akonadi::AddEmailAddressJob *job = new Akonadi::AddEmailAddressJob(emailString, mMainWindow, this);
job->setInteractive(true); job->setInteractive(true);
connect(job, &KPIM::AddEmailAddressJob::successMessage, this, [this](const QString &message) { connect(job, &Akonadi::AddEmailAddressJob::successMessage, this, [this](const QString &message) {
PimCommon::BroadcastStatus::instance()->setStatusMsg(message); PimCommon::BroadcastStatus::instance()->setStatusMsg(message);
}); });
job->start(); job->start();
@ -488,7 +488,7 @@ void KMReaderWin::slotMailtoOpenAddrBook()
} }
const QString emailString = KEmailAddress::decodeMailtoUrl(url).toLower(); const QString emailString = KEmailAddress::decodeMailtoUrl(url).toLower();
KPIM::OpenEmailAddressJob *job = new KPIM::OpenEmailAddressJob(emailString, mMainWindow, this); Akonadi::OpenEmailAddressJob *job = new Akonadi::OpenEmailAddressJob(emailString, mMainWindow, this);
job->start(); job->start();
} }
@ -838,9 +838,9 @@ void KMReaderWin::slotContactHtmlOptions()
} }
const QString emailString = KEmailAddress::decodeMailtoUrl(url).toLower(); const QString emailString = KEmailAddress::decodeMailtoUrl(url).toLower();
KPIM::AddEmailDisplayJob *job = new KPIM::AddEmailDisplayJob(emailString, mMainWindow, this); Akonadi::AddEmailDisplayJob *job = new Akonadi::AddEmailDisplayJob(emailString, mMainWindow, this);
job->setMessageId(mViewer->messageItem().id()); job->setMessageId(mViewer->messageItem().id());
connect(job, &KPIM::AddEmailDisplayJob::contactUpdated, this, &KMReaderWin::slotContactHtmlPreferencesUpdated); connect(job, &Akonadi::AddEmailDisplayJob::contactUpdated, this, &KMReaderWin::slotContactHtmlPreferencesUpdated);
job->setRemoteContent(mLoadExternalReference->isChecked()); job->setRemoteContent(mLoadExternalReference->isChecked());
job->setShowAsHTML(mViewAsHtml->isChecked()); job->setShowAsHTML(mViewAsHtml->isChecked());
job->setContact(mSearchedContact); job->setContact(mSearchedContact);

Write Preview
Loading…
Cancel
Save