Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / handlers.c

diff --git a/src/handlers.c b/src/handlers.c
index 1fb2bdd466014a464026704f91296a251b3bf8a8..148d63370a8b5cc2e4b1a45e04ae6ea382b00292 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -124,7 +124,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     if (command_output->needs_tree_render)
         tree_render();
 
-    free(command_output->json_output);
+    yajl_gen_free(command_output->json_gen);
 }
 
 /*
@@ -237,6 +237,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
     if (ws != con_get_workspace(focused))
         workspace_show(ws);
 
+    focused_id = XCB_NONE;
     con_focus(con_descend_focused(con));
     tree_render();
 
@@ -1006,7 +1007,7 @@ static struct property_handler_t property_handlers[] = {
  * received from X11
  *
  */
-void property_handlers_init() {
+void property_handlers_init(void) {
 
     sn_monitor_context_new(sndisplay, conn_screen, startup_monitor_event, NULL, NULL);