commit 0b44b1aa3d66f974e3d255c6e027947f1375b685
Author: Stephen Kelly <steveire@gmail.com>
Date:   Mon Apr 25 22:09:08 2011 +0200

    Only start akonadi asynchronously on KDE 4.6.2.
    
    Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
    the bug seen on fedora.
    
    Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
    best I can do because I can't reproduce the issue.
    
    BUG: 268120

diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index 200f8ec..e4cb3f7 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -49,7 +49,7 @@ int main( int argc, char **argv )
   MainWindow *window = new MainWindow;
   window->show();
 
-#if !KDE_IS_VERSION(4,6,0)
+#if !KDE_IS_VERSION(4,6,2)
   if ( !Akonadi::Control::start( window ) ) {
     //TODO: add message box after string freeze
     kWarning() << "Unable to start Akonadi server, exit application";
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 10b14e4..f6461d9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -189,7 +189,7 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
     mVacationIndicatorActive( false ),
     mGoToFirstUnreadMessageInSelectedFolder( false )
 {
-#if KDE_IS_VERSION(4,6,0)
+#if KDE_IS_VERSION(4,6,2)
   Akonadi::Control::widgetNeedsAkonadi(this);
   Akonadi::ServerManager::start();
 #endif
diff --git a/kmail/main.cpp b/kmail/main.cpp
index c2dd1c3..f59d5e6 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
   app.setEventLoopReached();
   app.delayedInstanceCreation();
 
-#if !KDE_IS_VERSION(4,6,0)
+#if !KDE_IS_VERSION(4,6,2)
   // Start Akonadi
   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
     //TODO: add message box after string freeze
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index cb4a235..ae460be 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -199,7 +199,7 @@ int main( int argc, char **argv )
 
   KontactApp app;
 
-#if !KDE_IS_VERSION(4,6,0)
+#if !KDE_IS_VERSION(4,6,2)
   // KDE 4.4: do akonadi startup before creating any window, since creating
   // the window loads kmail. In 4.5 we'll do this startup async instead.
   Akonadi::Control::start( 0 );