File plasma-libs.diff of Package kdelibs4.import4225

Overview Repositories Revisions Requests Users Attributes Meta

File plasma-libs.diff of Package kdelibs4.import4225

--- plasma/corona.cpp
+++ plasma/corona.cpp
@@ -196,7 +196,9 @@
 
         if (pluginName.isEmpty() || pluginName == "default") {
             // default to the desktop containment
-            pluginName = "desktop";
+            KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+            KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+            pluginName = group.readEntry("containment", "desktop");
         }
 
         bool loadingNull = pluginName == "null";
--- plasma/private/containment_p.h
+++ plasma/private/containment_p.h
@@ -60,6 +60,7 @@
           type(Containment::NoContainmentType),
           showDropZoneDelayTimer(0),
           drawWallpaper(true),
+          showToolBox(true),
           dropZoneStarted(false),
           containmentActionsSource(Global)
     {
@@ -184,6 +185,7 @@
     QHash<KJob*, KMenu*> dropMenus;
     QTimer *showDropZoneDelayTimer;
     bool drawWallpaper : 1;
+    bool showToolBox : 1;
     bool dropZoneStarted : 1;
 
     enum ContainmentActionsSource {
--- plasma/theme.cpp
+++ plasma/theme.cpp
@@ -78,7 +78,6 @@
           colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)),
           buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)),
           viewColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0)),
-          defaultWallpaperTheme(DEFAULT_WALLPAPER_THEME),
           defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX),
           defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH),
           defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT),
@@ -94,6 +93,10 @@
         ThemeConfig config;
         cacheTheme = config.cacheTheme();
 
+        KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+        KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+        defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME);
+
 #ifdef Q_WS_X11
         Display *dpy = QX11Info::display();
         int screen = DefaultScreen(dpy);
@@ -508,7 +511,10 @@
         cg = config();
     }
 
-    defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME);
+    KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc");
+    KConfigGroup group = KConfigGroup(defaultconfig, "Defaults");
+    defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME));
+
     defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX);
     defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH);
     defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT);
@@ -761,6 +767,10 @@
         }
     }
 
+    if (!QFile::exists(fullPath)) {
+        fullPath = KStandardDirs::locate("wallpaper", d->defaultWallpaperTheme);
+    }
+
     return fullPath;
 }

Places

File plasma-libs.diff of Package kdelibs4.import4225

Places