neutrino: fix most hardcoded paths

Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp


Origin commit data
------------------
Commit: 166e403965
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
This commit is contained in:
Stefan Seyfried
2013-03-10 02:01:52 +01:00
committed by [CST] Focus
parent ebc8c7bb43
commit f5a8635bf0
11 changed files with 13 additions and 11 deletions

View File

@@ -459,7 +459,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height)
}
}
#define LOGO_DIR1 "/share/tuxbox/neutrino/icons/logo"
#define LOGO_DIR1 DATADIR "/neutrino/icons/logo"
#define LOGO_FMT ".jpg"
bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, std::string & name, int *width, int *height)