devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 10:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth
2015-06-15 20:39:17 +01:00
parent b52de6869a 5cdd69f478
commit c76692516a
28 changed files with 313 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/client_events.c
View File

@@ -37,7 +37,7 @@
#include "config.h"
#include "log.h"
#include "ui/ui.h"
#include "ui/windows.h"
#include "window_list.h"
#include "xmpp/xmpp.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"

4
src/event/ui_events.c
View File

@@ -33,7 +33,7 @@
*/
#include "ui/ui.h"
#include "ui/windows.h"
#include "window_list.h"
void
ui_ev_focus_win(ProfWin *win)
@@ -53,4 +53,4 @@ ProfPrivateWin*
ui_ev_new_private_win(const char * const fulljid)
{
return ui_new_private_win(fulljid);
}
}