File plasma-plaindesktop.diff of Package kdebase4-workspace

--- plasma/desktop/containments/CMakeLists.txt
+++ plasma/desktop/containments/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(desktop)
 add_subdirectory(panel)
+add_subdirectory(plaindesktop)
--- plasma/desktop/containments/plaindesktop/CMakeLists.txt
+++ plasma/desktop/containments/plaindesktop/CMakeLists.txt
@@ -3,9 +3,9 @@
     itemspace.cpp
     desktoplayout.cpp)
 
-kde4_add_plugin(plasma_containment_desktop ${desktop_SRCS})
-target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
+kde4_add_plugin(plasma_containment_plaindesktop ${desktop_SRCS})
+target_link_libraries(plasma_containment_plaindesktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
 
-install(TARGETS plasma_containment_desktop DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-containment-desktop.desktop plasma-containment-desktopdashboard.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES plasma_desktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules)
+install(TARGETS plasma_containment_plaindesktop DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES plasma-containment-plaindesktop.desktop plasma-containment-plaindesktopdashboard.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES plasma_plaindesktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules)
--- plasma/desktop/containments/plaindesktop/desktop.cpp
+++ plasma/desktop/containments/plaindesktop/desktop.cpp
@@ -27,7 +27,7 @@
 using namespace Plasma;
 
 DefaultDesktop::DefaultDesktop(QObject *parent, const QVariantList &args)
-    : Containment(parent, args),
+    : Containment(parent, args, false),
       dropping(false),
       m_startupCompleted(false)
 {
--- plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktopdashboard.desktop
+++ plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktopdashboard.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
 # ctxt: plasma containment
-Name=Desktop Dashboard
-Comment=Default desktop containment
+Name=Plain Desktop Dashboard
+Comment=Desktop containment without toolbox
 Icon=user-desktop
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-ContainmentCategories=desktop
 NoDisplay=true
 
-X-KDE-Library=plasma_containment_desktop
+X-KDE-Library=plasma_containment_plaindesktop
 X-KDE-PluginInfo-Author=The Plasma Team
 X-KDE-PluginInfo-Email=panel-devel@kde.org
-X-KDE-PluginInfo-Name=desktopDashboard
+X-KDE-PluginInfo-Name=plaindesktopDashboard
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Containments
--- plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktop.desktop
+++ plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktop.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 # ctxt: plasma containment
-Name=Desktop
-Comment=Default desktop containment
+Name=Plain Desktop
+Comment=Plain desktop without toolbox
 Icon=user-desktop
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-ContainmentCategories=desktop
 NoDisplay=false
 
-X-KDE-Library=plasma_containment_desktop
-X-KDE-PluginInfo-Author=The Plasma Team
-X-KDE-PluginInfo-Email=panel-devel@kde.org
+X-KDE-Library=plasma_containment_plaindesktop
+X-KDE-PluginInfo-Author=SUSE KDE Team
+X-KDE-PluginInfo-Email=opensuse-kde@opensuse.org
 X-KDE-PluginInfo-Name=desktop
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://plasma.kde.org/