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

List:       kde-commits
Subject:    kdesupport/akonadi/server
From:       Constantin Berzan <exit3219 () gmail ! com>
Date:       2009-08-27 17:42:15
Message-ID: 1251394935.768904.2763.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1016381 by cberzan:

Disable autostarting of agents if the AKONADI_DISABLE_AGENT_AUTOSTART environment \
variable is present.

Reviewed at http://reviewboard.kde.org/r/1419/ .


 M  +7 -0      control/agentmanager.cpp  
 M  +1 -7      control/processcontrol.cpp  
 M  +7 -0      shared/akdebug.cpp  
 M  +6 -0      shared/akdebug.h  


--- trunk/kdesupport/akonadi/server/control/agentmanager.cpp #1016380:1016381
@@ -384,6 +384,13 @@
                             .arg( fileName, agentInfo.identifier ) );
         continue;
       }
+
+      const QString disableAutostart = getEnv( "AKONADI_DISABLE_AGENT_AUTOSTART" );
+      if( !disableAutostart.isEmpty() ) {
+        qDebug() << "Autostarting of agents is disabled.";
+        agentInfo.capabilities.removeOne( AgentType::CapabilityAutostart );
+      }
+
       qDebug() << "PLUGINS inserting: " << agentInfo.identifier << \
agentInfo.instanceCounter << agentInfo.capabilities;  mAgents.insert( \
                agentInfo.identifier, agentInfo );
       mAgentWatcher->addPath( Akonadi::XdgBaseDirs::findExecutableFile( \
                agentInfo.exec ) );
--- trunk/kdesupport/akonadi/server/control/processcontrol.cpp #1016380:1016381
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "processcontrol.h"
+#include "akdebug.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QTimer>
@@ -124,13 +125,6 @@
   }
 }
 
-namespace {
-  static QString getEnv( const char* name, const QString& defaultValue=QString() ) {
-    const QString v = QString::fromLocal8Bit( qgetenv( name ) );
-    return !v.isEmpty() ? v : defaultValue;
-  }
-}
-
 void ProcessControl::start()
 {
 #ifdef Q_OS_UNIX
--- trunk/kdesupport/akonadi/server/shared/akdebug.cpp #1016380:1016381
@@ -153,3 +153,10 @@
       qFatal( "Cannot rename log file - running on a readonly filesystem maybe?" );
   }
 }
+
+QString getEnv( const char *name, const QString &defaultValue )
+{
+  const QString v = QString::fromLocal8Bit( qgetenv( name ) );
+  return !v.isEmpty() ? v : defaultValue;
+}
+
--- trunk/kdesupport/akonadi/server/shared/akdebug.h #1016380:1016381
@@ -43,4 +43,10 @@
  */
 void akInit( const QString &baseName );
 
+/**
+ * Returns the contents of @p name environment variable if it is defined,
+ * or @p defaultValue otherwise.
+ */
+QString getEnv( const char *name, const QString &defaultValue = QString() );
+
 #endif


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