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

List:       kde-commits
Subject:    KDE/kdebase/workspace [POSSIBLY UNSAFE]
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2010-10-25 7:42:39
Message-ID: 20101025074239.AD150AC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189443 by ossi:

move kcm_kdm into kdm subdir

 M  +0 -12     CMakeLists.txt  
 M  +0 -1      kcontrol/CMakeLists.txt  
 D             kcontrol/kdm/AUTHORS  
 D             kcontrol/kdm/CMakeLists.txt  
 D             kcontrol/kdm/Messages.sh  
 D             kcontrol/kdm/anchor.png  
 D             kcontrol/kdm/background.cpp  
 D             kcontrol/kdm/background.h  
 D             kcontrol/kdm/background/CMakeLists.txt  
 D             kcontrol/kdm/background/Messages.sh  
 D             kcontrol/kdm/background/background.knsrc  
 D             kcontrol/kdm/background/bgadvanced.cpp  
 D             kcontrol/kdm/background/bgadvanced.h  
 D             kcontrol/kdm/background/bgadvanced_ui.ui  
 D             kcontrol/kdm/background/bgdefaults.h  
 D             kcontrol/kdm/background/bgdialog.cpp  
 D             kcontrol/kdm/background/bgdialog.h  
 D             kcontrol/kdm/background/bgdialog_ui.ui  
 D             kcontrol/kdm/background/bgmonitor.cpp  
 D             kcontrol/kdm/background/bgmonitor.h  
 D             kcontrol/kdm/background/bgrender.cpp  
 D             kcontrol/kdm/background/bgrender.h  
 D             kcontrol/kdm/background/bgsettings.cpp  
 D             kcontrol/kdm/background/bgsettings.h  
 D             kcontrol/kdm/background/bgwallpaper.cpp  
 D             kcontrol/kdm/background/bgwallpaper.h  
 D             kcontrol/kdm/background/bgwallpaper_ui.ui  
 D             kcontrol/kdm/background/patterns/CMakeLists.txt  
 D             kcontrol/kdm/background/patterns/fish.desktop  
 D             kcontrol/kdm/background/patterns/fish.png  
 D             kcontrol/kdm/background/patterns/flowers.desktop  
 D             kcontrol/kdm/background/patterns/flowers.png  
 D             kcontrol/kdm/background/patterns/night-rock.desktop   [TRAILING SPACE]
 D             kcontrol/kdm/background/patterns/night-rock.jpg  
 D             kcontrol/kdm/background/patterns/pavement.desktop  
 D             kcontrol/kdm/background/patterns/pavement.png  
 D             kcontrol/kdm/background/patterns/rattan.desktop  
 D             kcontrol/kdm/background/patterns/rattan.png  
 D             kcontrol/kdm/background/patterns/stonewall2.desktop  
 D             kcontrol/kdm/background/patterns/stonewall2.png  
 D             kcontrol/kdm/background/patterns/triangles.desktop  
 D             kcontrol/kdm/background/patterns/triangles.png  
 D             kcontrol/kdm/background/pics/CMakeLists.txt  
 D             kcontrol/kdm/background/pics/monitor.png  
 D             kcontrol/kdm/background/programs/CMakeLists.txt  
 D             kcontrol/kdm/background/programs/xearth.desktop   [TRAILING SPACE]
 D             kcontrol/kdm/background/programs/xglobe.desktop  
 D             kcontrol/kdm/background/programs/xplanet.desktop  
 D             kcontrol/kdm/helper.cpp  
 D             kcontrol/kdm/helper.h  
 D             kcontrol/kdm/kbackedcombobox.cpp  
 D             kcontrol/kdm/kbackedcombobox.h  
 D             kcontrol/kdm/kcmkdm_actions.actions  
 D             kcontrol/kdm/kdm-conv.cpp  
 D             kcontrol/kdm/kdm-conv.h  
 D             kcontrol/kdm/kdm-dlg.cpp  
 D             kcontrol/kdm/kdm-dlg.h  
 D             kcontrol/kdm/kdm-gen.cpp  
 D             kcontrol/kdm/kdm-gen.h  
 D             kcontrol/kdm/kdm-shut.cpp  
 D             kcontrol/kdm/kdm-shut.h  
 D             kcontrol/kdm/kdm-theme.cpp  
 D             kcontrol/kdm/kdm-theme.h  
 D             kcontrol/kdm/kdm-users.cpp  
 D             kcontrol/kdm/kdm-users.h  
 D             kcontrol/kdm/kdm.desktop   [TRAILING SPACE]
 D             kcontrol/kdm/kdm.knsrc  
 D             kcontrol/kdm/main.cpp  
 D             kcontrol/kdm/main.h  
 D             kcontrol/kdm/positioner.cpp  
 D             kcontrol/kdm/positioner.h  
 M  +6 -0      kdm/CMakeLists.txt  
 A             kdm/kcm (directory)  
 A             kdm/kcm/AUTHORS   kcontrol/kdm/AUTHORS#1189442
 AM            kdm/kcm/CMakeLists.txt   kcontrol/kdm/CMakeLists.txt#1189442
 AM            kdm/kcm/Messages.sh   kcontrol/kdm/Messages.sh#1189442
 AM            kdm/kcm/anchor.png   kcontrol/kdm/anchor.png#1189442
 A             kdm/kcm/background (directory)  
 AM            kdm/kcm/background.cpp   kcontrol/kdm/background.cpp#1189442 [License: \
GPL]  AM            kdm/kcm/background.h   kcontrol/kdm/background.h#1189442 \
[License: GPL]  AM            kdm/kcm/background/CMakeLists.txt   \
kcontrol/kdm/background/CMakeLists.txt#1189442  AM            \
kdm/kcm/background/Messages.sh   kcontrol/kdm/background/Messages.sh#1189442  A       \
kdm/kcm/background/background.knsrc   \
kcontrol/kdm/background/background.knsrc#1189442  AM            \
kdm/kcm/background/bgadvanced.cpp   kcontrol/kdm/background/bgadvanced.cpp#1189442 \
[License: GPL (v2)]  AM            kdm/kcm/background/bgadvanced.h   \
kcontrol/kdm/background/bgadvanced.h#1189442 [License: GPL (v2)]  A             \
kdm/kcm/background/bgadvanced_ui.ui   \
kcontrol/kdm/background/bgadvanced_ui.ui#1189442  AM            \
kdm/kcm/background/bgdefaults.h   kcontrol/kdm/background/bgdefaults.h#1189442 \
[License: GPL]  AM            kdm/kcm/background/bgdialog.cpp   \
kcontrol/kdm/background/bgdialog.cpp#1189442 [License: GPL (v2)]  AM            \
kdm/kcm/background/bgdialog.h   kcontrol/kdm/background/bgdialog.h#1189442 [License: \
GPL (v2)]  A             kdm/kcm/background/bgdialog_ui.ui   \
kcontrol/kdm/background/bgdialog_ui.ui#1189442  AM            \
kdm/kcm/background/bgmonitor.cpp   kcontrol/kdm/background/bgmonitor.cpp#1189442 \
[License: GPL (v2)]  AM            kdm/kcm/background/bgmonitor.h   \
kcontrol/kdm/background/bgmonitor.h#1189442 [License: GPL (v2)]  AM            \
kdm/kcm/background/bgrender.cpp   kcontrol/kdm/background/bgrender.cpp#1189442 \
[POSSIBLY UNSAFE: setShellCommand] [License: LGPL]  AM            \
kdm/kcm/background/bgrender.h   kcontrol/kdm/background/bgrender.h#1189442 [License: \
LGPL]  AM            kdm/kcm/background/bgsettings.cpp   \
kcontrol/kdm/background/bgsettings.cpp#1189442 [License: LGPL]  AM            \
kdm/kcm/background/bgsettings.h   kcontrol/kdm/background/bgsettings.h#1189442 \
[License: LGPL]  AM            kdm/kcm/background/bgwallpaper.cpp   \
kcontrol/kdm/background/bgwallpaper.cpp#1189442 [License: GPL (v2)]  AM            \
kdm/kcm/background/bgwallpaper.h   kcontrol/kdm/background/bgwallpaper.h#1189442 \
[License: GPL (v2)]  A             kdm/kcm/background/bgwallpaper_ui.ui   \
kcontrol/kdm/background/bgwallpaper_ui.ui#1189442  A             \
kdm/kcm/background/patterns (directory)    AM            \
kdm/kcm/background/patterns/CMakeLists.txt   \
kcontrol/kdm/background/patterns/CMakeLists.txt#1189442  A             \
kdm/kcm/background/patterns/fish.desktop   \
kcontrol/kdm/background/patterns/fish.desktop#1189442  AM            \
kdm/kcm/background/patterns/fish.png   \
kcontrol/kdm/background/patterns/fish.png#1189442  A             \
kdm/kcm/background/patterns/flowers.desktop   \
kcontrol/kdm/background/patterns/flowers.desktop#1189442  AM            \
kdm/kcm/background/patterns/flowers.png   \
kcontrol/kdm/background/patterns/flowers.png#1189442  A             \
kdm/kcm/background/patterns/night-rock.desktop   \
kcontrol/kdm/background/patterns/night-rock.desktop#1189442 [TRAILING SPACE]  AM      \
kdm/kcm/background/patterns/night-rock.jpg   \
kcontrol/kdm/background/patterns/night-rock.jpg#1189442  A             \
kdm/kcm/background/patterns/pavement.desktop   \
kcontrol/kdm/background/patterns/pavement.desktop#1189442  AM            \
kdm/kcm/background/patterns/pavement.png   \
kcontrol/kdm/background/patterns/pavement.png#1189442  A             \
kdm/kcm/background/patterns/rattan.desktop   \
kcontrol/kdm/background/patterns/rattan.desktop#1189442  AM            \
kdm/kcm/background/patterns/rattan.png   \
kcontrol/kdm/background/patterns/rattan.png#1189442  A             \
kdm/kcm/background/patterns/stonewall2.desktop   \
kcontrol/kdm/background/patterns/stonewall2.desktop#1189442  AM            \
kdm/kcm/background/patterns/stonewall2.png   \
kcontrol/kdm/background/patterns/stonewall2.png#1189442  A             \
kdm/kcm/background/patterns/triangles.desktop   \
kcontrol/kdm/background/patterns/triangles.desktop#1189442  AM            \
kdm/kcm/background/patterns/triangles.png   \
kcontrol/kdm/background/patterns/triangles.png#1189442  A             \
kdm/kcm/background/pics (directory)    AM            \
kdm/kcm/background/pics/CMakeLists.txt   \
kcontrol/kdm/background/pics/CMakeLists.txt#1189442  AM            \
kdm/kcm/background/pics/monitor.png   \
kcontrol/kdm/background/pics/monitor.png#1189442  A             \
kdm/kcm/background/programs (directory)    AM            \
kdm/kcm/background/programs/CMakeLists.txt   \
kcontrol/kdm/background/programs/CMakeLists.txt#1189442  A             \
kdm/kcm/background/programs/xearth.desktop   \
kcontrol/kdm/background/programs/xearth.desktop#1189442 [TRAILING SPACE]  A           \
kdm/kcm/background/programs/xglobe.desktop   \
kcontrol/kdm/background/programs/xglobe.desktop#1189442  A             \
kdm/kcm/background/programs/xplanet.desktop   \
kcontrol/kdm/background/programs/xplanet.desktop#1189442  AM            \
kdm/kcm/helper.cpp   kcontrol/kdm/helper.cpp#1189442 [License: GPL (v2+)]  AM         \
kdm/kcm/helper.h   kcontrol/kdm/helper.h#1189442 [License: GPL (v2+)]  AM            \
kdm/kcm/kbackedcombobox.cpp   kcontrol/kdm/kbackedcombobox.cpp#1189442 [License: GPL \
(v2+)]  AM            kdm/kcm/kbackedcombobox.h   \
kcontrol/kdm/kbackedcombobox.h#1189442 [License: GPL (v2+)]  A             \
kdm/kcm/kcmkdm_actions.actions   kcontrol/kdm/kcmkdm_actions.actions#1189442  AM      \
kdm/kcm/kdm-conv.cpp   kcontrol/kdm/kdm-conv.cpp#1189442 [License: GPL (v2+)]  AM     \
kdm/kcm/kdm-conv.h   kcontrol/kdm/kdm-conv.h#1189442 [License: GPL (v2+)]  AM         \
kdm/kcm/kdm-dlg.cpp   kcontrol/kdm/kdm-dlg.cpp#1189442 [License: GPL (v2+)]  AM       \
kdm/kcm/kdm-dlg.h   kcontrol/kdm/kdm-dlg.h#1189442 [License: GPL (v2+)]  AM           \
kdm/kcm/kdm-gen.cpp   kcontrol/kdm/kdm-gen.cpp#1189442 [License: GPL (v2+)]  AM       \
kdm/kcm/kdm-gen.h   kcontrol/kdm/kdm-gen.h#1189442 [License: GPL (v2+)]  AM           \
kdm/kcm/kdm-shut.cpp   kcontrol/kdm/kdm-shut.cpp#1189442 [License: GPL (v2+)]  AM     \
kdm/kcm/kdm-shut.h   kcontrol/kdm/kdm-shut.h#1189442 [License: GPL (v2+)]  AM         \
kdm/kcm/kdm-theme.cpp   kcontrol/kdm/kdm-theme.cpp#1189442 [License: GPL (v2+)]  AM   \
kdm/kcm/kdm-theme.h   kcontrol/kdm/kdm-theme.h#1189442 [License: GPL (v2+)]  AM       \
kdm/kcm/kdm-users.cpp   kcontrol/kdm/kdm-users.cpp#1189442 [License: GPL (v2+)]  AM   \
kdm/kcm/kdm-users.h   kcontrol/kdm/kdm-users.h#1189442 [License: GPL (v2+)]  A        \
kdm/kcm/kdm.desktop   kcontrol/kdm/kdm.desktop#1189442 [TRAILING SPACE]  A            \
kdm/kcm/kdm.knsrc   kcontrol/kdm/kdm.knsrc#1189442  AM            kdm/kcm/main.cpp   \
kcontrol/kdm/main.cpp#1189442 [License: GPL (v2+)]  AM            kdm/kcm/main.h   \
kcontrol/kdm/main.h#1189442 [License: GPL (v2+)]  AM            \
kdm/kcm/positioner.cpp   kcontrol/kdm/positioner.cpp#1189442 [License: GPL (v2+)]  AM \
kdm/kcm/positioner.h   kcontrol/kdm/positioner.h#1189442 [License: GPL (v2+)]  M  +1 \
-1      kdm/kfrontend/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1189442:1189443
@@ -96,18 +96,6 @@
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
-set( backgroundlib_SRCS
-    ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgrender.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgsettings.cpp
-)
-
-set( kcmbackgroundlib_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgdialog.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgadvanced.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgmonitor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgwallpaper.cpp
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/kdm
--- trunk/KDE/kdebase/workspace/kcontrol/CMakeLists.txt #1189442:1189443
@@ -17,7 +17,6 @@
 if(NOT WIN32)
 add_subdirectory( bell )
 add_subdirectory( input )
-add_subdirectory( kdm )
 add_subdirectory( access )
 if ( ${QT_QT3SUPPORT_FOUND} )
 add_subdirectory( screensaver )
--- trunk/KDE/kdebase/workspace/kdm/CMakeLists.txt #1189442:1189443
@@ -28,6 +28,12 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/TODO
 	devel-home:files/kdm)
 
+set(backgroundlib_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/kcm/background/bgrender.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/kcm/background/bgsettings.cpp
+)
+
 # after confci is defined
 add_subdirectory(backend)
 add_subdirectory(kfrontend)
+add_subdirectory(kcm)
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/CMakeLists.txt #1189442:1189443
@@ -5,7 +5,7 @@
 add_subdirectory( sessions )
 
 include_directories(
-	${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kdm/background
+	${CMAKE_CURRENT_SOURCE_DIR}/../kcm/background
 	${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kdm
 	${QIMAGEBLITZ_INCLUDES}
 )


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

Configure | About | News | Add a list | Sponsored by KoreLogic