aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-10-31 23:53:05 +00:00
commit 863018d103
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 "config.h"
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -41,8 +43,6 @@
#include <glib.h> #include <glib.h>
#include "config.h"
#include "chat_session.h" #include "chat_session.h"
#include "command/command.h" #include "command/command.h"
#include "command/commands.h" #include "command/commands.h"

3
src/event/client_events.c
View File

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

4
src/event/server_events.c
View File

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

4
src/main.c
View File

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

7
src/ui/chatwin.c
View File

@ -32,6 +32,8 @@
* *
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
@ -44,6 +46,9 @@
#include "ui/ui.h" #include "ui/ui.h"
#include "ui/window.h" #include "ui/window.h"
#include "ui/titlebar.h" #include "ui/titlebar.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
static void _chatwin_history(ProfChatWin *chatwin, const char *const contact); static void _chatwin_history(ProfChatWin *chatwin, const char *const contact);
@ -79,6 +84,7 @@ chatwin_receipt_received(ProfChatWin *chatwin, const char *const id)
win_mark_received(win, id); win_mark_received(win, id);
} }
#ifdef HAVE_LIBOTR
void void
chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted)
{ {
@ -201,6 +207,7 @@ chatwin_otr_untrust(ProfChatWin *chatwin)
title_bar_switch(); title_bar_switch();
} }
} }
#endif
void void
chatwin_recipient_gone(ProfChatWin *chatwin) chatwin_recipient_gone(ProfChatWin *chatwin)

8
src/ui/ui.h
View File

@ -35,10 +35,14 @@
#ifndef UI_UI_H #ifndef UI_UI_H
#define UI_UI_H #define UI_UI_H
#include "config.h"
#include "command/commands.h" #include "command/commands.h"
#include "ui/win_types.h" #include "ui/win_types.h"
#include "muc.h" #include "muc.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h" #include "otr/otr.h"
#endif
#define NO_ME 1 #define NO_ME 1
#define NO_DATE 2 #define NO_DATE 2
@ -65,11 +69,15 @@ void ui_sigwinch_handler(int sig);
ProfChatWin* chatwin_new(const char *const barejid); 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); 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 HAVE_LIBOTR
void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted); void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
void chatwin_otr_unsecured(ProfChatWin *chatwin); void chatwin_otr_unsecured(ProfChatWin *chatwin);
void chatwin_otr_trust(ProfChatWin *chatwin); void chatwin_otr_trust(ProfChatWin *chatwin);
void chatwin_otr_untrust(ProfChatWin *chatwin); void chatwin_otr_untrust(ProfChatWin *chatwin);
void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data); 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_receipt_received(ProfChatWin *chatwin, const char *const id);
void chatwin_recipient_gone(ProfChatWin *chatwin); void chatwin_recipient_gone(ProfChatWin *chatwin);
void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode); 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 "config.h"
#include <glib.h> #include <glib.h>
#include <wchar.h> #include <wchar.h>
@ -6,6 +8,9 @@
#include "ui/window.h" #include "ui/window.h"
#include "ui/ui.h" #include "ui/ui.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
#include "tests/unittests/ui/stub_ui.h" #include "tests/unittests/ui/stub_ui.h"
@ -66,11 +71,13 @@ GSList* ui_get_chat_recipients(void)
void ui_switch_win(ProfWin *win) {} void ui_switch_win(ProfWin *win) {}
#ifdef HAVE_LIBOTR
void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) {} void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) {}
void chatwin_otr_unsecured(ProfChatWin *chatwin) {} void chatwin_otr_unsecured(ProfChatWin *chatwin) {}
void chatwin_otr_trust(ProfChatWin *chatwin) {} void chatwin_otr_trust(ProfChatWin *chatwin) {}
void chatwin_otr_untrust(ProfChatWin *chatwin) {} void chatwin_otr_untrust(ProfChatWin *chatwin) {}
void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data) {} void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data) {}
#endif
void ui_sigwinch_handler(int sig) {} void ui_sigwinch_handler(int sig) {}