fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

Origin commit data
------------------
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
This commit is contained in:
vanhofen
2015-05-06 10:36:56 +02:00
parent 8e23a560fd
commit 3429bd79b2
10 changed files with 28 additions and 30 deletions

View File

@@ -219,7 +219,7 @@ CNeutrinoApp::CNeutrinoApp()
standby_pressed_at.tv_sec = 0;
frameBuffer = CFrameBuffer::getInstance();
frameBuffer->setIconBasePath(DATADIR "/neutrino/icons/");
frameBuffer->setIconBasePath(ICONSDIR);
SetupFrameBuffer();
mode = mode_unknown;
@@ -505,7 +505,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
//screen saver
g_settings.screensaver_delay = configfile.getInt32("screensaver_delay", 1);
g_settings.screensaver_dir = configfile.getString("screensaver_dir", DATADIR "/neutrino/icons/");
g_settings.screensaver_dir = configfile.getString("screensaver_dir", ICONSDIR);
g_settings.screensaver_timeout = configfile.getInt32("screensaver_timeout", 10);
//vcr