Merge branch 'master' into readline

Conflicts: src/ui/inputwin.c
2015-02-09 21:28:08 +00:00
parent 916ee1dc13 6682f243ce
commit 51ccb69580
6 changed files with 27 additions and 16 deletions
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -337,7 +337,7 @@ win_free(ProfWin* window)
        ProfChatWin *chatwin = (ProfChatWin*)window;
        free(chatwin->barejid);
        free(chatwin->resource_override);
-        free(chatwin->state);
+        chat_state_free(chatwin->state);
    }

    if (window->type == WIN_MUC) {