AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Xlib application icon fix

This commit is contained in:
Jack Andersen 2018-01-01 19:09:15 -10:00
parent 142c0c7dcd
commit 676a002aa3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/x11/ApplicationUnix.cpp
View File

@ -10,6 +10,10 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <cstdio> #include <cstdio>
/* No icon by default */
extern "C" const uint8_t MAINICON_NETWM[] __attribute__ ((weak)) = {};
extern "C" const size_t MAINICON_NETWM_SZ __attribute__ ((weak)) = 0;
DBusConnection* RegisterDBus(const char* appName, bool& isFirst) DBusConnection* RegisterDBus(const char* appName, bool& isFirst)
{ {
isFirst = true; isFirst = true;

6
lib/x11/WindowXlib.cpp
View File

@ -107,10 +107,6 @@ static const int ContextAttribList[7][7] =
extern "C" const uint8_t MAINICON_NETWM[]; extern "C" const uint8_t MAINICON_NETWM[];
extern "C" const size_t MAINICON_NETWM_SZ; extern "C" const size_t MAINICON_NETWM_SZ;
/* No icon by default */
extern const uint8_t MAINICON_NETWM[] __attribute__ ((weak)) = {};
extern const size_t MAINICON_NETWM_SZ __attribute__ ((weak)) = 0;
namespace boo namespace boo
{ {
static logvisor::Module Log("boo::WindowXlib"); static logvisor::Module Log("boo::WindowXlib");
@ -1051,7 +1047,7 @@ public:
/* Add window icon */ /* Add window icon */
if (MAINICON_NETWM_SZ && S_ATOMS->m_netwmIcon) if (MAINICON_NETWM_SZ && S_ATOMS->m_netwmIcon)
{ {
XChangeProperty(display, m_windowId, S_ATOMS->m_netwmIcon, XA_CARDINAL, XChangeProperty(m_xDisp, m_windowId, S_ATOMS->m_netwmIcon, XA_CARDINAL,
32, PropModeReplace, MAINICON_NETWM, MAINICON_NETWM_SZ / sizeof(unsigned long)); 32, PropModeReplace, MAINICON_NETWM, MAINICON_NETWM_SZ / sizeof(unsigned long));
} }