commit cfa404b7188e4c26bddbc9579728f6d25f8cd214 Author: Stephen Kelly Date: Tue Apr 5 11:09:43 2011 +0200 Start kdepim 4.4 asynchronously if built against 4.6. The synchronous mechanism doesn't have enough time to start before it reports failure. diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 356aa57..cb4a235 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -199,9 +199,11 @@ int main( int argc, char **argv ) KontactApp app; +#if !KDE_IS_VERSION(4,6,0) // 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 ); +#endif // Qt doesn't treat the system tray as a window, and therefore Qt would quit // the event loop when an error message is clicked away while Kontact is in the