File plasma-branding-defaults-corona.diff of Package kdebase4-workspace

Index: plasma/desktop/shell/desktopcorona.cpp
===================================================================
--- plasma/desktop/shell/desktopcorona.cpp.orig
+++ plasma/desktop/shell/desktopcorona.cpp
@@ -26,6 +26,7 @@
 #include <QTimer>
 #include <QMenu>
 #include <QSignalMapper>
+#include <QFile>
 
 
 #include <KDebug>
@@ -166,7 +167,9 @@ void DesktopCorona::addDesktopContainmen
     if (!c) {
         // first try for "desktop", if it doesn't exist then we try for any 
         // desktopy containment
-        c = addContainment("desktop");
+        KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+        KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+        c = addContainment(group.readEntry("containment", "desktop"));
 
         if (!c) {
             KPluginInfo::List desktopPlugins = Plasma::Containment::listContainmentsOfType("desktop");
@@ -436,6 +439,25 @@ void DesktopCorona::loadDefaultLayout()
         applet->setGlobalShortcut(KShortcut("Alt+F1"));
     }
 
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdashboard.desktop"))
+        loadDefaultApplet("showdashboard", panel);
+
+    QVariantList args;
+    if (QFile::exists("/usr/share/applications/MozillaFirefox.desktop")) {
+        args << "/usr/share/applications/MozillaFirefox.desktop";
+        panel->addApplet("icon", args);
+    }
+    else if (QFile::exists("/usr/share/applications/kde4/konqbrowser.desktop")) {
+        args << "/usr/share/applications/kde4/konqbrowser.desktop";
+        panel->addApplet("icon", args);
+    }
+
+    args.clear();
+    if (QFile::exists("/usr/share/applications/kde4/dolphin.desktop")) {
+        args << "/usr/share/applications/kde4/dolphin.desktop";
+        panel->addApplet("icon", args);
+    }
+
     loadDefaultApplet("pager", panel);
     loadDefaultApplet("tasks", panel);
     Plasma::Applet *sysTray = loadDefaultApplet("systemtray", panel);
@@ -447,7 +469,12 @@ void DesktopCorona::loadDefaultLayout()
         }
     }
 
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+       loadDefaultApplet("networkmanagement", panel);
+    }
+
     loadDefaultApplet("digital-clock", panel);
+	loadDefaultApplet("lockout", panel);
     emit containmentAdded(panel);
 
     QTimer::singleShot(1000, this, SLOT(saveDefaultSetup()));