current/SOURCES/kdepim-4.4.1-t1108431-kres-do-not-start-akonadi.patch

Index: migration/kres/main.cpp
===================================================================
--- migration/kres/main.cpp
+++ migration/kres/main.cpp     2010-03-28 23:42:50.000000000 +0200
@@ -85,9 +85,7 @@
 
   KGlobal::setAllowQuit( true );
   KGlobal::locale()->insertCatalog( "libakonadi" );
-  if ( !Akonadi::Control::start( 0 ) )
-    return 2;
-
+  
   InfoDialog *infoDialog = 0;
   if ( args->isSet( "interactive" ) || args->isSet( "interactive-on-change" ) ) {
     infoDialog = new InfoDialog( args->isSet( "interactive-on-change" ) );
1	Index: migration/kres/main.cpp
2	===================================================================
3	--- migration/kres/main.cpp
4	+++ migration/kres/main.cpp 2010-03-28 23:42:50.000000000 +0200
5	@@ -85,9 +85,7 @@
6
7	KGlobal::setAllowQuit( true );
8	KGlobal::locale()->insertCatalog( "libakonadi" );
9	- if ( !Akonadi::Control::start( 0 ) )
10	- return 2;
11	-
12	+
13	InfoDialog *infoDialog = 0;
14	if ( args->isSet( "interactive" ) \|\| args->isSet( "interactive-on-change" ) ) {
15	infoDialog = new InfoDialog( args->isSet( "interactive-on-change" ) );