Merge branch 'master' of git://github.com/memeplex/awesome

This commit is contained in:
Uli Schlachter 2014-08-20 11:32:52 +02:00
commit d4d729e216
1 changed files with 4 additions and 3 deletions

View File

@ -323,6 +323,10 @@ systray_update(int base_size, bool horizontal, bool reverse, int spacing)
int int
luaA_systray(lua_State *L) luaA_systray(lua_State *L)
{ {
if(globalconf.systray.parent == NULL)
systray_register();
if(lua_gettop(L) != 0) if(lua_gettop(L) != 0)
{ {
size_t bg_len; size_t bg_len;
@ -344,9 +348,6 @@ luaA_systray(lua_State *L)
XCB_CW_BACK_PIXEL, config_back); XCB_CW_BACK_PIXEL, config_back);
} }
if(globalconf.systray.parent == NULL)
systray_register();
if(globalconf.systray.parent != w) if(globalconf.systray.parent != w)
xcb_reparent_window(globalconf.connection, xcb_reparent_window(globalconf.connection,
globalconf.systray.window, globalconf.systray.window,