3382 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	a5677206e9	Merge branch 'master' into pgp	2015-05-04 21:20:40 +01:00
James Booth	ac940c2c8a	Revert "Added carbons handler" ... This reverts commit ff867e7f2b.	2015-05-04 21:18:53 +01:00
James Booth	aca102f542	Merge branch 'master' into pgp	2015-05-04 01:34:18 +01:00
James Booth	c8eaaa0ce9	Added ui_ev_new_private_win to ui events	2015-05-04 01:31:27 +01:00
James Booth	3dace733d9	Merge branch 'master' into pgp	2015-05-04 01:10:30 +01:00
James Booth	b1dd1e2726	cl_ev_send_muc_msg takes ProfMucWin as arg	2015-05-04 01:06:12 +01:00
James Booth	bb2b5d20d5	Merge branch 'master' into pgp	2015-05-04 00:57:17 +01:00
James Booth	ef54ff305e	ui_outgoing_chat_msg now takes ProfChatWin as argument	2015-05-04 00:55:43 +01:00
James Booth	bab4da039a	Merge branch 'master' into pgp	2015-05-04 00:43:36 +01:00
James Booth	c3d2a7e937	Added roster list function to get display name for messages	2015-05-03 23:38:46 +01:00
James Booth	0f3bece9e2	Merge branch 'master' into pgp	2015-05-03 02:35:15 +01:00
James Booth	ff867e7f2b	Added carbons handler	2015-05-03 02:34:58 +01:00
James Booth	bec9b53f10	Merge branch 'master' into pgp	2015-05-03 02:04:21 +01:00
James Booth	4e1c2a4f64	Show resource in status bar	2015-05-03 02:04:04 +01:00
James Booth	f65c82e112	Merge branch 'master' into pgp	2015-05-03 01:48:32 +01:00
James Booth	f25f90b38b	Extracted receipt request processing in message.c	2015-05-03 01:48:12 +01:00
James Booth	d3f4347513	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-05-03 01:30:14 +01:00
James Booth	530c060d2a	Extract private message hanlding in message.c	2015-05-03 01:25:33 +01:00
James Booth	79d21d4cd2	Merge branch 'master' into pgp	2015-05-03 00:35:47 +01:00
James Booth	236c854419	Tidy message.c	2015-05-03 00:35:31 +01:00
James Booth	03ef791401	Merge branch 'master' into pgp	2015-05-03 00:06:12 +01:00
James Booth	5a90e2862e	Extracted receipt received handler	2015-05-03 00:05:47 +01:00
James Booth	0bc4377ad7	Merge branch 'master' into pgp	2015-05-02 23:40:34 +01:00
James Booth	ddc64755a0	Tidy message.c	2015-05-02 23:40:14 +01:00
James Booth	8c72f0deb5	Merge branch 'master' into pgp	2015-05-02 23:24:50 +01:00
James Booth	be4ee40ed4	Pass ProfChatWin to otr_on_message_send	2015-05-02 23:23:12 +01:00
James Booth	cade9e7c4c	Merge branch 'master' into pgp	2015-05-01 00:55:58 +01:00
James Booth	0118178080	Removed server event delegation functions	2015-05-01 00:55:40 +01:00
James Booth	0bd642edf8	Merge branch 'master' into pgp	2015-04-30 23:38:28 +01:00
James Booth	e11e55e31a	Move current win check to event, removed next and prev win functions	2015-04-30 22:43:08 +01:00
James Booth	a3a4b6267b	Merge branch 'master' into pgp	2015-04-30 22:10:03 +01:00
James Booth	d68fb25dde	Removed ui_win_switch_num	2015-04-30 22:09:39 +01:00
James Booth	20555fcb36	Added assert to ui_switch_win	2015-04-30 21:27:44 +01:00
James Booth	7730674f45	Merge branch 'master' into pgp	2015-04-30 21:24:06 +01:00
James Booth	0a6b76d6d3	Removed some ui functions, inlined	2015-04-30 21:23:43 +01:00
James Booth	d5188a160e	Merge branch 'master' into pgp	2015-04-29 23:16:43 +01:00
James Booth	2e75e54460	Added ui_win_error_line()	2015-04-29 23:16:28 +01:00
James Booth	0fece78dfe	Merge branch 'master' into pgp	2015-04-29 23:08:23 +01:00
James Booth	665c34414d	Return result on OTR message sending	2015-04-29 22:59:44 +01:00
James Booth	0df8b8beff	Return new window on new chat win event	2015-04-29 22:10:32 +01:00
James Booth	8de308c96a	Changed message when sending non encrypted message with OTR policy always	2015-04-29 21:55:09 +01:00
James Booth	15b34692fd	Reuse ui_new_chat_win	2015-04-29 21:42:29 +01:00
James Booth	0296a60390	_win_show_history takes ProfChatWin as first arg	2015-04-29 21:19:20 +01:00
James Booth	5d827cafec	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-04-28 23:57:28 +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	403e9b47fe	Removed commented code	2015-04-28 23:00:06 +01:00
James Booth	43189b1ab4	Merge branch 'master' into pgp	2015-04-27 23:45:51 +01:00
James Booth	70d1756a1c	Moved otr message send event to otr module	2015-04-27 23:30:33 +01:00
James Booth	eb177ccbef	Removed server_events dependency on libotr headers	2015-04-27 23:17:38 +01:00