107 Commits

Author	SHA1	Message	Date
James Booth	d2a30b1263	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c src/ui/core.c	2015-10-28 00:06:13 +00:00
James Booth	e7148bf82d	Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg	2015-10-27 23:20:03 +00:00
James Booth	f081aa7aa2	Merge branch 'master' into plugins ... Conflicts: src/command/commands.c src/command/commands.h src/main.c src/ui/console.c src/ui/core.c src/ui/notifier.c src/ui/ui.h src/ui/window.c src/window_list.c src/window_list.h src/xmpp/connection.c	2015-10-26 01:05:13 +00:00
James Booth	afbd2693cd	Applied coding style to src/event/	2015-10-25 22:32:46 +00:00
James Booth	34b19c5738	Merge branch 'master' into plugins ... Conflicts: src/command/command.c src/profanity.c src/xmpp/connection.c	2015-10-18 03:11:02 +01:00
James Booth	6640a0891f	Force tls on all connections, add tls policy account property	2015-10-18 03:06:23 +01:00
James Booth	17e435dfaf	Merge branch 'master' into plugins ... Conflicts: src/xmpp/roster.c	2015-09-27 23:58:11 +01:00
James Booth	9593e17c3c	Include last activity in initial presence	2015-09-27 23:53:06 +01:00
James Booth	5499580b6d	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c src/ui/core.c	2015-08-30 01:37:22 +01:00
James Booth	b4722632b6	Split PGP incoming and outgoing message handling	2015-08-30 01:32:13 +01:00
James Booth	5e962fe0f5	Fixed compile when no OTR or PGP support	2015-08-26 01:48:21 +01:00
James Booth	ade1070c8e	Merge branch 'master' into plugins ... Conflicts: src/config/preferences.h src/event/client_events.c src/event/server_events.c src/ui/core.c	2015-08-26 01:45:19 +01:00
James Booth	f998ab8f3b	Display special char for encrypted messages	2015-08-26 00:42:56 +01:00
James Booth	4d4a3cb1b9	Merge branch 'master' into plugins	2015-06-24 22:15:34 +01:00
James Booth	524c7a8671	Free account on pgp presence send	2015-06-24 22:02:29 +01:00
James Booth	1087041dcf	Merge branch 'master' into plugins ... Conflicts: .travis.yml src/command/commands.c src/event/client_events.c src/event/server_events.c src/ui/core.c src/ui/titlebar.c	2015-06-21 23:22:09 +01:00
James Booth	3d2f999efb	Added PGP logging preferences	2015-06-21 21:42:58 +01:00
James Booth	03a4aa4408	Tidied OTR and PGP combinations in client_events.c	2015-06-21 19:29:23 +01:00
James Booth	e45afd5c09	Added pgp checks for message sending	2015-06-21 01:48:25 +01:00
James Booth	edbb3d938e	Merge branch 'master' into openpgp	2015-06-19 00:15:40 +01:00
James Booth	69b9434b00	Merge branch 'master' into plugins	2015-06-19 00:15:22 +01:00
James Booth	e117c0368f	Added missing include client_events.c	2015-06-19 00:14:48 +01:00
James Booth	db9d44bc28	Merge branch 'master' into plugins ... Conflicts: Makefile.am src/config/preferences.c src/config/preferences.h src/config/theme.h src/ui/ui.h src/ui/window.h src/window_list.c	2015-06-15 21:00:49 +01:00
James Booth	c76692516a	Merge branch 'master' into openpgp	2015-06-15 20:39:17 +01:00
James Booth	38ed9188d3	Moved ui/windows -> window_list	2015-06-15 19:26:28 +01:00
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +01:00
James Booth	80665ea051	Added rooms iq test	2015-05-24 04:13:28 +01:00
James Booth	acd2d2309f	Moved pgp signature generation to cl_ev_presence_send	2015-05-08 00:07:21 +01:00
James Booth	ca729cbdf6	Merge branch 'master' into plugins ... Conflicts: src/xmpp/roster.c	2015-05-07 23:23:38 +01:00
James Booth	d853284f92	Added cl_ev_presence_send	2015-05-07 23:21:48 +01:00
James Booth	05aa313bff	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c	2015-05-04 01:34:13 +01:00
James Booth	c8eaaa0ce9	Added ui_ev_new_private_win to ui events	2015-05-04 01:31:27 +01:00
James Booth	b64a5aca10	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c	2015-05-04 01:10:20 +01:00
James Booth	b1dd1e2726	cl_ev_send_muc_msg takes ProfMucWin as arg	2015-05-04 01:06:12 +01:00
James Booth	d0fb792d8b	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c	2015-05-04 00:57:13 +01:00
James Booth	ef54ff305e	ui_outgoing_chat_msg now takes ProfChatWin as argument	2015-05-04 00:55:43 +01:00
James Booth	0698fda335	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c	2015-05-02 23:24:42 +01:00
James Booth	be4ee40ed4	Pass ProfChatWin to otr_on_message_send	2015-05-02 23:23:12 +01:00
James Booth	f34bee8229	Merge branch 'master' into plugins	2015-04-29 23:16:39 +01:00
James Booth	2e75e54460	Added ui_win_error_line()	2015-04-29 23:16:28 +01:00
James Booth	43048908d4	Merge branch 'master' into plugins ... Conflicts: src/command/commands.c src/event/client_events.c src/ui/core.c	2015-04-29 23:08:18 +01:00
James Booth	665c34414d	Return result on OTR message sending	2015-04-29 22:59:44 +01:00
James Booth	ddf71d88a1	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c src/xmpp/connection.c	2015-04-28 23:56:08 +01:00
James Booth	d3698e6bee	Added ui events module	2015-04-28 23:53:37 +01:00
James Booth	8aba52f4fe	Renamed event functions	2015-04-28 23:38:56 +01:00
James Booth	38d305dc79	Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c src/event/server_events.c	2015-04-27 23:45:46 +01:00
James Booth	70d1756a1c	Moved otr message send event to otr module	2015-04-27 23:30:33 +01:00
James Booth	2ef0fdabbd	Merge branch 'master' into plugins	2015-04-23 23:47:52 +01:00
James Booth	bc9e6b79cd	Tidied account login	2015-04-23 21:56:48 +01:00
James Booth	837988b2eb	Merge branch 'master' into plugins	2015-04-22 00:29:53 +01:00
James Booth	ba286c54ef	Moved login events to client events module	2015-04-22 00:29:37 +01:00
James Booth	4503ee4be0	Merge branch 'master' into plugins ... Conflicts: src/command/commands.c src/event/client_events.c	2015-04-21 23:35:33 +01:00
James Booth	88739d5c59	Moved new chat win events to client events module	2015-04-21 23:28:52 +01:00
James Booth	07908f17ac	Merge branch 'master' into plugins ... Conflicts: src/command/commands.c	2015-04-21 22:07:53 +01:00
James Booth	53f2a4a35c	Moved all message sending to client events module	2015-04-21 21:57:39 +01:00
James Booth	bcfbfec583	Merge branch 'master' into plugins ... Conflicts: Makefile.am src/command/commands.c	2015-04-19 19:50:06 +01:00
James Booth	32da6548da	Added client_events module, reuse message sending code for all commands	2015-04-19 19:40:15 +01:00