snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DE detection fix

This commit is contained in:
KockaAdmiralac 2018-04-29 22:44:42 +02:00
parent 4c7342eebb
commit 3bc8b3e24a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/oneshot.cpp
View File

@ -69,9 +69,6 @@ struct OneshotPrivate
bool winPosChanged; bool winPosChanged;
std::vector<uint8_t> obscuredMap; std::vector<uint8_t> obscuredMap;
bool obscuredCleared; bool obscuredCleared;
#if defined OS_LINUX
std::string desktopEnv;
#endif
OneshotPrivate() OneshotPrivate()
: window(0), : window(0),
@ -282,10 +279,10 @@ Oneshot::Oneshot(RGSSThreadData &threadData) :
desktop.find("gnome") != std::string::npos || desktop.find("gnome") != std::string::npos ||
desktop.find("unity") != std::string::npos desktop.find("unity") != std::string::npos
) { ) {
p->desktopEnv = "gnome"; desktopEnv = "gnome";
gtk_init(0, 0); gtk_init(0, 0);
} else if (desktop.find("xfce") != std::string::npos) { } else if (desktop.find("xfce") != std::string::npos) {
p->desktopEnv = "xfce"; desktopEnv = "xfce";
} }
#endif #endif
@ -458,7 +455,7 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
if (!title) if (!title)
title = ""; title = "";
#if defined OS_LINUX #if defined OS_LINUX
if (p->desktopEnv == "gnome") { if (desktopEnv == "gnome") {
linux_DialogData data = {type, body, title, 0}; linux_DialogData data = {type, body, title, 0};
gdk_threads_add_idle(linux_dialog, &data); gdk_threads_add_idle(linux_dialog, &data);
gtk_main(); gtk_main();