Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/editor/kmcomposewin.cpp
	kmail/kmmainwidget.cpp
	kmail/widgets/kactionmenutransport.cpp
	messagecomposer/sender/akonadisender.cpp
	messagecomposer/sender/akonadisender.h
	messagecomposer/sender/messagesender.h
	mobile/mail/mainview.cpp
	mobile/mail/mainview.h

editor/kmcomposewin.cpp

@@ -1135,10 +1135,6 @@ void KMComposeWin::setupActions(void)
         actionCollection()->addAction(QLatin1String("send_alternative_via"), actActionNowMenu);
     }
 
-    // needed for sending "default transport"
-    actActionNowMenu->setDelayed(true);
-    actActionLaterMenu->setDelayed(true);
-
     connect(actActionNowMenu, SIGNAL(triggered(bool)), this,
             SLOT(slotSendNow()));
     connect(actActionLaterMenu, SIGNAL(triggered(bool)), this,

kmmainwidget.cpp

@@ -2333,8 +2333,8 @@ void KMMainWidget::slotSendQueued()
 void KMMainWidget::slotSendQueuedVia(MailTransport::Transport *transport)
 {
     if (transport) {
-        if (kmkernel->msgSender()) {
-            kmkernel->msgSender()->sendQueued(transport->name());
+        if ( kmkernel->msgSender() ) {
+            kmkernel->msgSender()->sendQueued( transport->id() );
         }
     }
 }
@@ -2884,7 +2884,6 @@ void KMMainWidget::setupActions()
     mSendActionMenu->setIcon(QIcon::fromTheme(QLatin1String("mail-send-via")));
     mSendActionMenu->setText(i18n("Send Queued Messages Via"));
     actionCollection()->addAction(QLatin1String("send_queued_via"), mSendActionMenu);
-    mSendActionMenu->setDelayed(true);
 
     connect(mSendActionMenu, SIGNAL(transportSelected(MailTransport::Transport*)), SLOT(slotSendQueuedVia(MailTransport::Transport*)));
 

widgets/kactionmenutransport.cpp

@@ -23,10 +23,10 @@ KActionMenuTransport::KActionMenuTransport(QObject *parent)
     : KActionMenu(parent),
       mInitialized(false)
 {
+    setDelayed(true);
     connect(MailTransport::TransportManager::self(), SIGNAL(transportsChanged()), this, SLOT(updateTransportMenu()));
     connect(menu(), SIGNAL(aboutToShow()), SLOT(slotCheckTransportMenu()));
     connect(menu(), SIGNAL(triggered(QAction*)), this, SLOT(slotSelectTransport(QAction*)));
-
 }
 
 KActionMenuTransport::~KActionMenuTransport()
@@ -37,20 +37,22 @@ KActionMenuTransport::~KActionMenuTransport()
 void KActionMenuTransport::slotCheckTransportMenu()
 {
     if (!mInitialized) {
-        updateTransportMenu();
         mInitialized = true;
+        updateTransportMenu();
     }
 }
 
 void KActionMenuTransport::updateTransportMenu()
 {
-    menu()->clear();
-    const QList<MailTransport::Transport *> transports = MailTransport::TransportManager::self()->transports();
-    Q_FOREACH (MailTransport::Transport *transport, transports) {
-        const QString name = transport->name().replace(QLatin1Char('&'), QLatin1String("&&"));
-        QAction *action = new QAction(name, this);
-        action->setData(transport->id());
-        menu()->addAction(action);
+    if (mInitialized) {
+        menu()->clear();
+        const QList<MailTransport::Transport*> transports = MailTransport::TransportManager::self()->transports();
+        Q_FOREACH (MailTransport::Transport *transport, transports ) {
+            const QString name = transport->name().replace( QLatin1Char('&'), QLatin1String("&&") );
+            QAction *action = new QAction( name, this );
+            action->setData( transport->id() );
+            menu()->addAction( action );
+        }
     }
 }