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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/server/control
From:       Till Adam <adam () kde ! org>
Date:       2007-08-25 18:51:37
Message-ID: 1188067897.646976.8190.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 704671 by tilladam:

Make akonadi_control work on OSX by making sure it finds bundles (like the 
agents with UI). This currently means linking against kdecore, no clue if there's
a FDO implementation of this logic somewhere ....


 M  +1 -1      CMakeLists.txt  
 M  +9 -3      agentmanager.cpp  


--- trunk/KDE/kdepim/akonadi/server/control/CMakeLists.txt #704670:704671
@@ -31,7 +31,7 @@
 kde4_add_executable(akonadi_control NOGUI ${control_SRCS})
 set_target_properties(akonadi_control PROPERTIES OUTPUT_NAME akonadi_control)
 
-target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
+target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBRARY})
 
 install(TARGETS akonadi_control DESTINATION ${BIN_INSTALL_DIR})
 
--- trunk/KDE/kdepim/akonadi/server/control/agentmanager.cpp #704670:704671
@@ -29,7 +29,11 @@
 #include <QtCore/QSettings>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusError>
+#include <QtCore/QDebug>
 
+#include <kstandarddirs.h>
+
+
 AgentManager::AgentManager( QObject *parent )
   : QObject( parent )
 {
@@ -177,7 +181,7 @@
   QStringList arguments;
   arguments << "--identifier" << agentIdentifier;
 
-  const QString executable = mPluginInfos[ identifier ].exec;
+  const QString executable = KStandardDirs::findExe( mPluginInfos[ identifier ].exec );
   mInstances[ agentIdentifier ].controller->start( executable, arguments );
 
   save();
@@ -343,6 +347,8 @@
 void AgentManager::readPluginInfos( const QDir& directory )
 {
   QStringList files = directory.entryList();
+  qDebug() << "PLUGINS: " << directory;
+  qDebug() << "PLUGINS: " << files;
   for ( int i = 0; i < files.count(); ++i ) {
     const QString fileName = directory.absoluteFilePath( files[ i ] );
 
@@ -378,7 +384,7 @@
       continue;
     }
 
-
+  qDebug() << "PLUGINS inserting: " << identifier;
     mPluginInfos.insert( identifier, info );
   }
 }
@@ -472,7 +478,7 @@
     QStringList arguments;
     arguments << "--identifier" << instanceIdentifier;
 
-    const QString executable = mPluginInfos[ agentType ].exec;
+    const QString executable = KStandardDirs::findExe( mPluginInfos[ agentType ].exec );
     mInstances[ instanceIdentifier ].controller->start( executable, arguments );
 
     file.endGroup();
[prev in list] [next in list] [prev in thread] [next in thread]