Merge branch 'i3bar_warning_fix'

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

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