[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-01-11 12:59:40
Message-ID: 1231678780.619669.17644.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 909347 by vkrause:

Allow to optionally omit creation of client side bridges.


 M  +1 -0      kdepim/akonadi/migration/kres/kres-migratorrc  
 M  +6 -3      kdepimlibs/akonadi/firstrun.cpp  
 M  +5 -2      kdepimlibs/kresources/factory.cpp  


--- trunk/KDE/kdepim/akonadi/migration/kres/kres-migratorrc #909346:909347
@@ -1,3 +1,4 @@
 [Migration]
 Enabled=true
+SetupClientBridge=true
 TargetVersion=1
--- trunk/KDE/kdepimlibs/akonadi/firstrun.cpp #909346:909347
@@ -93,15 +93,18 @@
   KConfig config( QLatin1String("kres-migratorrc") );
   KConfigGroup migrationCfg( &config, "Migration" );
   const bool enabled = migrationCfg.readEntry( "Enabled", false );
+  const bool setupClientBridge = migrationCfg.readEntry( "SetupClientBridge", true \
);  const int currentVersion = migrationCfg.readEntry( \
QString::fromLatin1("Version-%1").arg( resourceFamily ), 0 );  const int \
targetVersion = migrationCfg.readEntry( "TargetVersion", 0 );  if ( enabled && \
                currentVersion < targetVersion ) {
     kDebug() << "Performing migration of legacy KResource settings. Good luck!";
     mProcess = new KProcess( this );
     connect( mProcess, SIGNAL(finished(int)), SLOT(migrationFinished(int)) );
-    mProcess->setProgram( QLatin1String("kres-migrator"),
-                          QStringList() << QLatin1String("--interactive-on-change")
-                                        << QLatin1String("--type") << resourceFamily \
); +    QStringList args = QStringList() << QLatin1String("--interactive-on-change")
+                                     << QLatin1String("--type") << resourceFamily;
+    if ( !setupClientBridge )
+      args << QLatin1String( "--omit-client-bridge" );
+    mProcess->setProgram( QLatin1String("kres-migrator"), args );
     mProcess->start();
     if ( !mProcess->waitForStarted() )
       migrationFinished( -1 );
--- trunk/KDE/kdepimlibs/kresources/factory.cpp #909346:909347
@@ -76,13 +76,16 @@
     KConfig *config = new KConfig( "kres-migratorrc" );
     KConfigGroup migrationCfg( config, "Migration" );
     const bool enabled = migrationCfg.readEntry( "Enabled", false );
+    const bool setupClientBrige = migrationCfg.readEntry( "SetupClientBridge", true \
                );
     const int currentVersion = migrationCfg.readEntry( "Version-" + resourceFamily, \
                0 );
     const int targetVersion = migrationCfg.readEntry( "TargetVersion", 0 );
     if ( enabled && currentVersion < targetVersion ) {
       kDebug() << "Performing Akonadi migration. Good luck!";
       KProcess proc;
-      proc.setProgram( "kres-migrator",
-                       QStringList() << "--interactive-on-change" << "--type" << \
resourceFamily ); +      QStringList args = QStringList() << \
"--interactive-on-change" << "--type" << resourceFamily; +      if ( \
!setupClientBrige ) +        args << "--omit-client-bridge";
+      proc.setProgram( "kres-migrator", args );
       proc.start();
       bool result = proc.waitForStarted();
       if ( result ) {


[prev in list] [next in list] [prev in thread] [next in thread]