Contents of /trunk/kdepim4/patches/kdepim4-4.4.0-akonadi.patch
Parent Directory | Revision Log
Revision 983 -
(show annotations)
(download)
Sun Feb 14 14:24:18 2010 UTC (14 years, 7 months ago) by niro
File size: 996 byte(s)
Sun Feb 14 14:24:18 2010 UTC (14 years, 7 months ago) by niro
File size: 996 byte(s)
renamed to 4.4.0
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. |