kdepim4/patches/kdepim4-4.4.0-akonadi.patch

Index: kontact/src/main.cpp
===================================================================
--- kontact/src/main.cpp	(Revision 1087777)
+++ kontact/src/main.cpp	(Revision 1087778)
@@ -138,7 +138,6 @@
         mMainWindow->setInitialActivePluginModule( moduleName );
       }
       mMainWindow->show();
-      Akonadi::Control::start( mMainWindow );
       KontactInterface::UniqueAppHandler::setMainWidget( mMainWindow );
       // --iconify is needed in kontact, although kstart can do that too,
       // because kstart returns immediately so it's too early to talk D-Bus to the app.
@@ -200,6 +199,10 @@
 
   KontactApp app;
 
+  // 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 );
+
   // 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
   // tray.
1	Index: kontact/src/main.cpp
2	===================================================================
3	--- kontact/src/main.cpp (Revision 1087777)
4	+++ kontact/src/main.cpp (Revision 1087778)
5	@@ -138,7 +138,6 @@
6	mMainWindow->setInitialActivePluginModule( moduleName );
7	}
8	mMainWindow->show();
9	- Akonadi::Control::start( mMainWindow );
10	KontactInterface::UniqueAppHandler::setMainWidget( mMainWindow );
11	// --iconify is needed in kontact, although kstart can do that too,
12	// because kstart returns immediately so it's too early to talk D-Bus to the app.
13	@@ -200,6 +199,10 @@
14
15	KontactApp app;
16
17	+ // KDE 4.4: do akonadi startup before creating any window, since creating
18	+ // the window loads kmail. In 4.5 we'll do this startup async instead.
19	+ Akonadi::Control::start( 0 );
20	+
21	// Qt doesn't treat the system tray as a window, and therefore Qt would quit
22	// the event loop when an error message is clicked away while Kontact is in the
23	// tray.