aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	src/command/command.c
	src/event/client_events.c
	src/event/server_events.c
	src/main.c
	src/ui/chatwin.c
This commit is contained in:
James Booth 2015-10-31 23:51:34 +00:00
commit c994a7a5ec
7 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/command.c
View File

@ -32,6 +32,8 @@
*
*/
#include "prof_config.h"
#include <assert.h>
#include <errno.h>
#include <limits.h>
@ -41,8 +43,6 @@
#include <glib.h>
#include "prof_config.h"
#include "chat_session.h"
#include "command/command.h"
#include "command/commands.h"

3
src/event/client_events.c
View File

@ -32,10 +32,11 @@
*
*/
#include "prof_config.h"
#include <stdlib.h>
#include <glib.h>
#include "prof_config.h"
#include "log.h"
#include "ui/ui.h"
#include "window_list.h"

4
src/event/server_events.c
View File

@ -32,12 +32,12 @@
*
*/
#include "prof_config.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include "prof_config.h"
#include "chat_session.h"
#include "log.h"
#include "muc.h"

4
src/main.c
View File

@ -31,10 +31,12 @@
* source files in the program, then also delete it here.
*
*/
#include "prof_config.h"
#include <string.h>
#include <glib.h>
#include "prof_config.h"
#ifdef PROF_HAVE_GIT_VERSION
#include "gitversion.h"
#endif

7
src/ui/chatwin.c
View File

@ -32,6 +32,8 @@
*
*/
#include "prof_config.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
@ -45,6 +47,9 @@
#include "ui/window.h"
#include "ui/titlebar.h"
#include "plugins/plugins.h"
#ifdef PROF_HAVE_LIBOTR
#include "otr/otr.h"
#endif
static void _chatwin_history(ProfChatWin *chatwin, const char *const contact);
@ -80,6 +85,7 @@ chatwin_receipt_received(ProfChatWin *chatwin, const char *const id)
win_mark_received(win, id);
}
#ifdef PROF_HAVE_LIBOTR
void
chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted)
{
@ -202,6 +208,7 @@ chatwin_otr_untrust(ProfChatWin *chatwin)
title_bar_switch();
}
}
#endif
void
chatwin_recipient_gone(ProfChatWin *chatwin)

8
src/ui/ui.h
View File

@ -35,10 +35,14 @@
#ifndef UI_UI_H
#define UI_UI_H
#include "prof_config.h"
#include "command/commands.h"
#include "ui/win_types.h"
#include "muc.h"
#ifdef PROF_HAVE_LIBOTR
#include "otr/otr.h"
#endif
#define NO_ME 1
#define NO_DATE 2
@ -65,11 +69,15 @@ void ui_sigwinch_handler(int sig);
ProfChatWin* chatwin_new(const char *const barejid);
void chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource, const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
#ifdef PROF_HAVE_LIBOTR
void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
void chatwin_otr_unsecured(ProfChatWin *chatwin);
void chatwin_otr_trust(ProfChatWin *chatwin);
void chatwin_otr_untrust(ProfChatWin *chatwin);
void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data);
#endif
void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
void chatwin_recipient_gone(ProfChatWin *chatwin);
void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);

7
tests/unittests/ui/stub_ui.c
View File

@ -1,3 +1,5 @@
#include "prof_config.h"
#include <glib.h>
#include <wchar.h>
@ -6,6 +8,9 @@
#include "ui/window.h"
#include "ui/ui.h"
#ifdef PROF_HAVE_LIBOTR
#include "otr/otr.h"
#endif
#include "tests/unittests/ui/stub_ui.h"
@ -66,11 +71,13 @@ GSList* ui_get_chat_recipients(void)
void ui_switch_win(ProfWin *win) {}
#ifdef PROF_HAVE_LIBOTR
void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) {}
void chatwin_otr_unsecured(ProfChatWin *chatwin) {}
void chatwin_otr_trust(ProfChatWin *chatwin) {}
void chatwin_otr_untrust(ProfChatWin *chatwin) {}
void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data) {}
#endif
void ui_sigwinch_handler(int sig) {}