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

List:       kde-commits
Subject:    KDE/kdebase/workspace [POSSIBLY UNSAFE]
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2007-02-22 23:16:05
Message-ID: 1172186165.212587.32701.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 636392 by aseigo:

commit the beginning of making the runners pluggable, something Gael Beaudoin is \
working on. temporarily move the runner class into libworkspace until a better home \
is made for it, but this lets Gael continue working at least. runner.h is not \
installed, of course.


 M  +7 -8      krunner/CMakeLists.txt  
 D             krunner/apprunner.cpp  
 D             krunner/apprunner.h  
 M  +18 -6     krunner/interface.cpp  
 D             krunner/runner.cpp  
 D             krunner/runner.h  
 A             krunner/runners (directory)  
 A             krunner/runners/CMakeLists.txt  
 A             krunner/runners/app (directory)  
 A             krunner/runners/app/apprunner.cpp   [License: LGPL (v2)]
 A             krunner/runners/app/apprunner.h   [License: LGPL (v2)]
 A             krunner/runners/search (directory)  
 A             krunner/runners/search/CMakeLists.txt  
 A             krunner/runners/search/krunner_searchrunner.desktop  
 A             krunner/runners/search/searchrunner.cpp   [License: LGPL (v2)]
 A             krunner/runners/search/searchrunner.h   [License: LGPL (v2)]
 A             krunner/runners/shell (directory)  
 A             krunner/runners/shell/shellrunner.cpp   [POSSIBLY UNSAFE: \
KRun::runCommand] [License: LGPL (v2)]  A             \
krunner/runners/shell/shellrunner.h   [License: LGPL (v2)]  D             \
krunner/searchrunner.cpp    D             krunner/searchrunner.h  
 D             krunner/shellrunner.cpp  
 D             krunner/shellrunner.h  
 M  +1 -0      lib/CMakeLists.txt  
 A             lib/runner.cpp   krunner/runner.cpp#636277
 A             lib/runner.h   krunner/runner.h#636277 [License: LGPL (v2)]


--- trunk/KDE/kdebase/workspace/krunner/CMakeLists.txt #636391:636392
@@ -9,21 +9,19 @@
 set(screensaver_dbusXML org.kde.ScreenSaver.xml)
 set(krunner_BGIMAGES images/background/dialog.svg)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/plasma/lib)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/plasma/lib \
${CMAKE_CURRENT_SOURCE_DIR}/workspace/lib)  
 set(krunner_SRCS interface.cpp
                  krunnerapp.cpp
-                 runner.cpp
-                 apprunner.cpp
                  restartingapplication.cpp
-                 searchrunner.cpp
-                 shellrunner.cpp
                  main.cpp
+                 runners/app/apprunner.cpp
+                 runners/shell/shellrunner.cpp
+                 saverengine.cpp
+                 startupid.cpp
                  xautolock.cpp
                  xautolock_diy.c
-                 xautolock_engine.c
-                 saverengine.cpp
-                 startupid.cpp)
+                 xautolock_engine.c)
 
 kde4_add_kcfg_files(krunner_SRCS ${krunner_KCFG_SRCS})
 
@@ -38,6 +36,7 @@
 endif(X11_Xss_LIB)
 
 add_subdirectory( lock )
+add_subdirectory( runners )
 
 install(TARGETS krunner DESTINATION ${BIN_INSTALL_DIR})
 install(FILES krunner.desktop  DESTINATION  ${AUTOSTART_INSTALL_DIR})
--- trunk/KDE/kdebase/workspace/krunner/interface.cpp #636391:636392
@@ -30,9 +30,11 @@
 
 #include "../plasma/lib/theme.h"
 
-#include "shellrunner.h"
-#include "apprunner.h"
-#include "searchrunner.h"
+#include <kservicetypetrader.h>
+//#include "shellrunner.h"
+//#include "apprunner.h"
+//#include "searchrunner.h"
+
 #include "interface.h"
 #include "interfaceadaptor.h"
 #include <QApplication>
@@ -220,9 +222,19 @@
     m_runners.clear();
     m_currentRunner = 0;
 
-    m_runners.append(new ShellRunner(this));
-    m_runners.append(new AppRunner(this));
-    m_runners.append(new SearchRunner(this));
+//    m_runners.append(new ShellRunner(this));
+//    m_runners.append(new AppRunner(this));
+//    m_runners.append(new SearchRunner(this));
+
+    KService::List offers = KServiceTypeTrader::self()->query("KRunner/Runner");
+    KService::List::ConstIterator it;
+	for(it = offers.begin(); it != offers.end(); ++it)
+	{
+		KService::Ptr service = *it;
+		
+kDebug() << "runner : " << service->name() << endl ;
+
+	}
 }
 
 #include "interface.moc"
--- trunk/KDE/kdebase/workspace/lib/CMakeLists.txt #636391:636392
@@ -7,6 +7,7 @@
 
 set(kworkspace_LIB_SRCS kworkspace.cpp
                         kwindowlistmenu.cpp
+                        runner.cpp
    )
 
 set(ksmserver_xml  ${CMAKE_SOURCE_DIR}/workspace/ksmserver/org.kde.KSMServerInterface.xml)



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