mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix most hardcoded paths

Browse Source
This commit is contained in:
Stefan Seyfried
2013-03-10 02:01:52 +01:00
parent 49d9ebf833
commit ffd4daea7c
17 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/localize.cpp
View File

@@ -111,7 +111,7 @@ CLocaleManager::~CLocaleManager()
delete[] defaultData;
}
const char * path[2] = {"/var/tuxbox/config/locale/", DATADIR "/neutrino/locale/"};
const char * path[2] = { CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"};
CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault)
{

4
src/system/setting_helpers.cpp
View File

@@ -468,7 +468,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
return true;
if(delete_all) {
my_system(3, "/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.conf");
my_system(3, "/bin/sh", "-c", "rm -f " CONFIGDIR "/zapit/*.conf");
CServiceManager::getInstance()->SatelliteList().clear();
CZapit::getInstance()->LoadSettings();
CZapit::getInstance()->GetConfig(zapitCfg);
@@ -488,7 +488,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
CFrameBuffer::getInstance()->Clear();
}
if(delete_chan) {
my_system(3, "/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.xml");
my_system(3, "/bin/sh", "-c", "rm -f " CONFIGDIR "/zapit/*.xml");
g_Zapit->reinitChannels();
}
return ret;