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

astyle kdelibs

Browse Source
wilder-work
Montel Laurent 11 years ago
parent bb55c5db8c
commit 1371f3c172
4 changed files with 24 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
  2. 2
      editor/potentialphishingemail/potentialphishingemailjob.cpp
  3. 38
      kmreadermainwin.cpp
  4. 2
      kmreadermainwin.h

10
editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
Unescape View File

@ -50,11 +50,11 @@ void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails_data()
QTest::newRow("NoPotentialPhishing") << (QStringList() << QLatin1String("foo@kde.org")) << QStringList() << false;
QTest::newRow("HasPotentialPhishing") << (QStringList() << QLatin1String("\"bla@kde.org\" <foo@kde.org>")) << QStringList() << true;
const QString email = QLatin1String("\"bla@kde.org\" <foo@kde.org>");
QTest::newRow("EmailInWhiteList") << (QStringList() << email) << (QStringList() << email) << false;
QTest::newRow("NotAllEmailInWhiteList") << (QStringList() << email << QLatin1String("\"c@kde.org\" <dd@kde.org>")) << (QStringList() << email) << true;
QTest::newRow("EmailInWhiteListWithSpace") << (QStringList() << QLatin1String(" \"bla@kde.org\" <foo@kde.org> ")) << (QStringList() << email) << false;
QTest::newRow("EmailWithSameNameAndDisplayName") << (QStringList() << QLatin1String("\"<foo@kde.com>\" <foo@kde.com>")) << (QStringList() << email) << false;
QTest::newRow("EmailWithSameNameAndDisplayNameWithSpace") << (QStringList() << QLatin1String(" \"<foo@kde.com>\" <foo@kde.com> ")) << (QStringList() << email) << false;
QTest::newRow("EmailInWhiteList") << (QStringList() << email) << (QStringList() << email) << false;
QTest::newRow("NotAllEmailInWhiteList") << (QStringList() << email << QLatin1String("\"c@kde.org\" <dd@kde.org>")) << (QStringList() << email) << true;
QTest::newRow("EmailInWhiteListWithSpace") << (QStringList() << QLatin1String(" \"bla@kde.org\" <foo@kde.org> ")) << (QStringList() << email) << false;
QTest::newRow("EmailWithSameNameAndDisplayName") << (QStringList() << QLatin1String("\"<foo@kde.com>\" <foo@kde.com>")) << (QStringList() << email) << false;
QTest::newRow("EmailWithSameNameAndDisplayNameWithSpace") << (QStringList() << QLatin1String(" \"<foo@kde.com>\" <foo@kde.com> ")) << (QStringList() << email) << false;
}
void PotentialPhishingEmailJobTest::shouldReturnPotentialPhishingEmails()

2
editor/potentialphishingemail/potentialphishingemailjob.cpp
Unescape View File

@ -61,7 +61,7 @@ bool PotentialPhishingEmailJob::start()
// which is always false
if (tname.contains(QLatin1String("@"))) { //Potential address
if (tname.startsWith(QLatin1Char('<')) && tname.endsWith(QLatin1Char('>'))) {
tname = tname.mid(1,tname.length()-2);
tname = tname.mid(1, tname.length() - 2);
}
if (temail != tname) {
mPotentialPhisingEmails.append(addr);

38
kmreadermainwin.cpp
Unescape View File

@ -371,13 +371,12 @@ QAction *KMReaderMainWin::copyActionMenu(QMenu *menu)
QAction *KMReaderMainWin::moveActionMenu(QMenu *menu)
{
KMMainWidget* mainwin = kmkernel->getKMMainWidget();
if ( mainwin )
{
KActionMenu *action = new KActionMenu( menu );
action->setText(i18n("Move Message To...") );
mainwin->standardMailActionManager()->standardActionManager()->createActionFolderMenu( action->menu(), Akonadi::StandardActionManager::MoveItemToMenu );
connect( action->menu(), SIGNAL(triggered(QAction*)), SLOT(slotMoveItem(QAction*)) );
KMMainWidget *mainwin = kmkernel->getKMMainWidget();
if (mainwin) {
KActionMenu *action = new KActionMenu(menu);
action->setText(i18n("Move Message To..."));
mainwin->standardMailActionManager()->standardActionManager()->createActionFolderMenu(action->menu(), Akonadi::StandardActionManager::MoveItemToMenu);
connect(action->menu(), SIGNAL(triggered(QAction*)), SLOT(slotMoveItem(QAction*)));
return action;
}
@ -387,19 +386,16 @@ QAction *KMReaderMainWin::moveActionMenu(QMenu *menu)
void KMReaderMainWin::slotMoveItem(QAction *action)
{
if ( action )
{
if (action) {
const QModelIndex index = action->data().value<QModelIndex>();
const Akonadi::Collection collection = index.data( Akonadi::EntityTreeModel::CollectionRole ).value<Akonadi::Collection>();
const Akonadi::Collection collection = index.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
if ( mMsg.isValid() ) {
Akonadi::ItemMoveJob *job = new Akonadi::ItemMoveJob( mMsg, collection,this );
connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)) );
}
else
{
Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob( mMsg, collection, this );
connect( job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)) );
if (mMsg.isValid()) {
Akonadi::ItemMoveJob *job = new Akonadi::ItemMoveJob(mMsg, collection, this);
connect(job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)));
} else {
Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(mMsg, collection, this);
connect(job, SIGNAL(result(KJob*)), this, SLOT(slotCopyMoveResult(KJob*)));
}
}
}
@ -420,7 +416,7 @@ void KMReaderMainWin::slotCopyItem(QAction *action)
}
}
void KMReaderMainWin::slotCopyMoveResult( KJob * job )
void KMReaderMainWin::slotCopyMoveResult(KJob *job)
{
if (job->error()) {
KMessageBox::sorry(this, i18n("Cannot copy item. %1", job->errorString()));
@ -574,8 +570,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg , const QUrl &ur
menu->addAction(mMsgActions->forwardMenu());
menu->addSeparator();
}
menu->addAction( copyActionMenu(menu) );
menu->addAction( moveActionMenu(menu));
menu->addAction(copyActionMenu(menu));
menu->addAction(moveActionMenu(menu));
menu->addSeparator();
if (!imageUrl.isEmpty()) {

2
kmreadermainwin.h
Unescape View File

@ -77,7 +77,7 @@ private Q_SLOTS:
/// forwarding is set.
void slotReplyOrForwardFinished();
void slotCopyItem(QAction *);
void slotCopyMoveResult( KJob * job );
void slotCopyMoveResult(KJob *job);
void slotMoveItem(QAction *action);
private:

Write Preview
Loading…
Cancel
Save