nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-03-19 21:42:08 +01:00
parent 45d5f1fbaa d43a91e45a
commit e7761a342b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
i3bar/src/xcb.c
View File

@ -10,6 +10,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xproto.h> #include <xcb/xproto.h>
#include <xcb/xcb_atom.h> #include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
#ifdef XCB_COMPAT #ifdef XCB_COMPAT
#include "xcb_compat.h" #include "xcb_compat.h"
@ -810,7 +811,7 @@ char *init_xcb_early() {
#define ATOM_DO(name) atom_cookies[name] = xcb_intern_atom(xcb_connection, 0, strlen(#name), #name); #define ATOM_DO(name) atom_cookies[name] = xcb_intern_atom(xcb_connection, 0, strlen(#name), #name);
#include "xcb_atoms.def" #include "xcb_atoms.def"
xcb_screen = xcb_setup_roots_iterator(xcb_get_setup(xcb_connection)).data; xcb_screen = xcb_aux_get_screen(xcb_connection, screen);
xcb_root = xcb_screen->root; xcb_root = xcb_screen->root;
/* We draw the statusline to a seperate pixmap, because it looks the same on all bars and /* We draw the statusline to a seperate pixmap, because it looks the same on all bars and