Merge branch 'master' into refactor2

Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2013-11-11 20:51:35 +00:00
16 changed files with 139 additions and 31 deletions

View File

@@ -847,8 +847,8 @@ ui_new_chat_win(const char * const to)
if (contact != NULL) {
if (strcmp(p_contact_presence(contact), "offline") == 0) {
const char const *show = p_contact_presence(contact);
const char const *status = p_contact_status(contact);
const char * const show = p_contact_presence(contact);
const char * const status = p_contact_status(contact);
win_show_status_string(window, to, show, status, NULL, "--", "offline");
}
}