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

kmmainwidget.cpp

@@ -4295,11 +4295,10 @@ void KMMainWidget::slotShowStartupFolder()
 {
   connect( MailCommon::FilterManager::instance(), SIGNAL(filtersChanged()),
            this, SLOT(initializeFilterActions()) );
-
   // Plug various action lists. This can't be done in the constructor, as that is called before
   // the main window or Kontact calls createGUI().
   // This function however is called with a single shot timer.
-  initializeFilterActions();
+  checkAkonadiServerManagerState();
   mFolderShortcutActionManager->createActions();
   mTagActionManager->createActions();
   messageActions()->setupForwardingActionsList( mGUIClient );
@@ -4313,6 +4312,26 @@ void KMMainWidget::slotShowStartupFolder()
   }
 }
 
+void KMMainWidget::checkAkonadiServerManagerState()
+{
+    Akonadi::ServerManager::State state = Akonadi::ServerManager::self()->state();
+    if(state == Akonadi::ServerManager::Running) {
+        initializeFilterActions();
+    } else {
+        connect( Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)),
+                 SLOT(slotServerStateChanged(Akonadi::ServerManager::State)) );
+    }
+}
+
+void KMMainWidget::slotServerStateChanged(Akonadi::ServerManager::State state)
+{
+  if(state == Akonadi::ServerManager::Running) {
+    initializeFilterActions();
+    disconnect( Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)));
+  }
+}
+
+
 void KMMainWidget::slotShowTip()
 {
   KTipDialog::showTip( this, QString(), true );

kmmainwidget.h

@@ -441,6 +441,7 @@ class KMAIL_EXPORT KMMainWidget : public QWidget
     void slotCreateAddressBookContact();
     void slotOpenRecentMsg(const KUrl& url);
   private:
+    void checkAkonadiServerManagerState();
     void updateHtmlMenuEntry();
 
     void updateMoveAction( const Akonadi::CollectionStatistics& statistic );
@@ -540,6 +541,7 @@ class KMAIL_EXPORT KMMainWidget : public QWidget
     void slotDeletionCollectionResult(KJob* job);
     void slotServerSideSubscription();
     void slotFetchItemsForFolderDone(KJob*job);
+    void slotServerStateChanged(Akonadi::ServerManager::State state);
 
 private:
     // Message actions