oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Also support X11 icon for minetest copies installed via make install (#4407)

Browse source 
Fixes #4323.
This commit is contained in:
est31 2016-08-20 21:26:44 +02:00 • committed by GitHub
parent 6590140260
commit f092dac979
5 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/porting.cpp
View file

@ -611,7 +611,24 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
#endif
}
bool setXorgWindowIcon(IrrlichtDevice *device,
bool setXorgWindowIcon(IrrlichtDevice *device)
{
#if RUN_IN_PLACE
return setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
#else
// We have semi-support for reading in-place data if we are
// compiled with RUN_IN_PLACE. Don't break with this and
// also try the path_share location.
return
setXorgWindowIconFromPath(device,
ICON_DIR "/hicolor/128x128/apps/" PROJECT_NAME ".png") ||
setXorgWindowIconFromPath(device,
path_share + "/misc/" PROJECT_NAME "-xorg-icon-128.png");
#endif
}
bool setXorgWindowIconFromPath(IrrlichtDevice *device,
const std::string &icon_file)
{
#ifdef XORG_USED