From 2b1c0dcf269d617de1f6c203df547166661f089e Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 28 Jul 2010 19:57:31 +0200
Subject: Centralized configuration default values using the VariableData
 system.

Please note that I didn't turned all the getValue() call into new ones,
simply because I have to have config object initiated which is not
forcefully the case the branding file.

Resolves: Manasource Mantis #170.
---
 src/resources/wallpaper.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/resources/wallpaper.cpp')

diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 22bbda9c..06675ab1 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -53,26 +53,20 @@ static void initDefaultWallpaperPaths()
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Init the path
-    wallpaperPath = branding.getValue("wallpapersPath", "");
+    wallpaperPath = branding.getStringValue("wallpapersPath");
 
     if (!wallpaperPath.empty() && resman->isDirectory(wallpaperPath))
         return;
     else
-        wallpaperPath = paths.getValue("wallpapers", "");
-
-    if (wallpaperPath.empty() || !resman->isDirectory(wallpaperPath))
-        wallpaperPath = "graphics/images/";
+        wallpaperPath = paths.getValue("wallpapers", "graphics/images/");
 
     // Init the default file
-    wallpaperFile = branding.getValue("wallpaperFile", "");
+    wallpaperFile = branding.getStringValue("wallpaperFile");
 
-    if (!wallpaperFile.empty() && resman->isDirectory(wallpaperFile))
+    if (!wallpaperFile.empty())
         return;
     else
-        wallpaperFile = paths.getValue("wallpaperFile", "");
-
-    if (wallpaperFile.empty() || !resman->isDirectory(wallpaperFile))
-        wallpaperFile = "login_wallpaper.png";
+        wallpaperFile = paths.getValue("wallpaperFile", "login_wallpaper.png");
 }
 
 bool wallpaperCompare(WallpaperData a, WallpaperData b)
@@ -82,7 +76,7 @@ bool wallpaperCompare(WallpaperData a, WallpaperData b)
 
     return (aa > ab || (aa == ab && a.width > b.width));
 }
-
+#include <iostream>
 void Wallpaper::loadWallpapers()
 {
     wallpaperData.clear();
-- 
cgit v1.2.3-70-g09d2