mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
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
------------------
Branch: ni/coolstream
Commit: 166e403965
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
------------------
This commit was generated by Migit
This commit is contained in:
committed by
[CST] Focus
parent
bd3e8fca4a
commit
2e9fbd20ed
@@ -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)
|
||||
|
Reference in New Issue
Block a user