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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2008-07-21 16:59:50
Message-ID: 1216659590.804173.21503.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836066 by segato:

fix and enable kickoff under windows

 M  +1 -1      CMakeLists.txt  
 M  +4 -1      kickoff/CMakeLists.txt  
 M  +2 -0      kickoff/core/itemhandlers.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/CMakeLists.txt #836065:836066
@@ -5,8 +5,8 @@
 add_subdirectory(icon)
 add_subdirectory(devicenotifier)
 add_subdirectory(trash)
+add_subdirectory(kickoff)
 if(NOT WIN32)
-add_subdirectory(kickoff)
 add_subdirectory(pager)
 add_subdirectory(systemtray)
 add_subdirectory(tasks)
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/CMakeLists.txt #836065:836066
@@ -33,12 +33,15 @@
 QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${screensaver_xml} screensaver_interface)
 set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/org.kde.krunner.Interface.xml)
 QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${krunner_xml} krunner_interface)
-
+if(NOT WIN32)
 set ( Kickoff_LIBS
         ${KDE4_KIO_LIBS}
         ${KDE4_KFILE_LIBS}
         ${KDE4_SOLID_LIBS}
         kworkspace)
+else(NOT WIN32)
+set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS})
+endif(NOT WIN32)
 if(HAVE_STRIGIDBUS)
      set ( Kickoff_LIBS ${Kickoff_LIBS} strigiqtdbusclient )
 endif(HAVE_STRIGIDBUS)
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/itemhandlers.cpp #836065:836066
@@ -105,7 +105,9 @@
         type = KWorkSpace::ShutdownTypeHalt;
     }
 
+#ifndef Q_WS_WIN
     KWorkSpace::requestShutDown(confirm,type);
+#endif
 }
 
 void LeaveItemHandler::lock()
[prev in list] [next in list] [prev in thread] [next in thread]