Merge branch 'master' into next

2011-08-10 23:56:16 +02:00 · 2011-08-10 23:56:16 +02:00 · 9ccb3987ad
parent 3af7692a92 318dfce42f
commit 9ccb3987ad
2 changed files with 2 additions and 2 deletions
--- a/i3bar/include/workspaces.h
+++ b/i3bar/include/workspaces.h
@ -21,7 +21,7 @@ TAILQ_HEAD(ws_head, i3_ws);
 * Start parsing the received json-string
 *
 */
-void parse_workspaces_json();
+void parse_workspaces_json(char *json);

 /*
 * free() all workspace data-structures
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@ -31,7 +31,7 @@ typedef struct xcb_colors_t xcb_colors_t;
 * Initialize xcb and use the specified fontname for text-rendering
 *
 */
-char *init_xcb();
+char *init_xcb(char *fontname);

 /*
 * Initialize the colors