devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth
2015-02-01 20:47:28 +00:00
parent 702ea0b5f3 5b26879e31
commit 372cf822cb
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/console.c
View File

@@ -1402,7 +1402,7 @@ cons_help(void)
cons_show("/help basic - List basic commands for getting started.");
cons_show("/help chatting - List chat commands.");
cons_show("/help groupchat - List groupchat commands.");
cons_show("/help presence - List commands to change presence.");
cons_show("/help presences - List commands to change presence.");
cons_show("/help contacts - List commands for manipulating your roster.");
cons_show("/help service - List service discovery commands.");
cons_show("/help settings - List commands for changing settings.");

2
src/ui/core.c
View File

@@ -1402,8 +1402,8 @@ ui_outgoing_chat_msg(const char * const from, const char * const barejid,
// create new window
if (window == NULL) {
window = wins_new_chat(barejid);
ProfChatWin *chatwin = (ProfChatWin*)window;
#ifdef HAVE_LIBOTR
ProfChatWin *chatwin = (ProfChatWin*)window;
if (otr_is_secure(barejid)) {
chatwin->is_otr = TRUE;
}