2797 Commits

Author	SHA1	Message	Date
James Booth	b736883ac4	Added roster to new help format	2015-07-24 21:20:55 +01:00
James Booth	a8eb281553	Added msg to new help format	2015-07-24 00:44:56 +01:00
James Booth	44d7a152a4	Added connect to new help format	2015-07-24 00:33:38 +01:00
James Booth	22111bf75b	Moved help and about to new format	2015-07-23 23:05:33 +01:00
James Booth	e55ef63f61	Merge branch 'master' into help	2015-07-22 22:59:20 +01:00
James Booth	f9a7e35001	Added id attributes to roster queries ... fixes #596	2015-07-22 22:48:37 +01:00
James Booth	59dd87d5f8	Fix /help commands spacing	2015-07-21 22:55:39 +01:00
James Booth	b63ede7964	Fixed time preference display	2015-07-19 22:56:22 +01:00
James Booth	46e2f11b93	Removed /mouse command	2015-07-19 22:48:12 +01:00
James Booth	84cc67fa88	Removed 'empty' from roster autocompleter	2015-07-14 20:59:55 +01:00
James Booth	051c6ed50e	Check for self jid on /software ... fixed #592	2015-07-08 21:05:20 +01:00
James Booth	9a5fe29caa	Changed /roster empty -> /roster remove_all contacts ... Make it difficult to accidentally use this command.	2015-07-08 20:51:39 +01:00
Daniel	806afcc014	Allow hiding of empty presence groups: /roster {show,hide} empty (default is show)	2015-07-08 13:11:56 +02:00
James Booth	6c668bce88	Migrate old time display format settings	2015-07-02 16:31:09 +01:00
James Booth	84a8da7741	Default autoping to 1 minute #541	2015-07-02 00:10:31 +01:00
James Booth	fb8b223876	Removed subscribed check when displaying roster panel	2015-07-02 00:01:37 +01:00
James Booth	10eb0bbbf8	Merge remote-tracking branch 'SamWhited/otr_no_store_carbons'	2015-07-01 21:09:45 +01:00
James Booth	d8c410d289	Don't write chars during password input	2015-07-01 21:00:31 +01:00
James Booth	446f5f0aa1	Merge remote-tracking branch 'pasis/ui-ignore-EINTR'	2015-07-01 20:55:22 +01:00
James Booth	106e909fbd	Merge remote-tracking branch 'incertia/time' ... Conflicts: src/config/preferences.c	2015-07-01 20:16:09 +01:00
Sam Whited	167ee28ec0	Add no-copy and no-store hints to OTR messages	2015-07-01 09:04:54 -05:00
James Booth	d5f79c7b35	Use reference counts for GDateTimes #516	2015-06-30 16:21:21 +01:00
James Booth	dd206ef637	WIP fix for #516, needs memory cleanup	2015-06-29 23:48:41 +01:00
Dmitry Podgorny	f24019ee4d	ui: Ignore EINTR in inp_readline() ... EINTR is usual situation during resizing of terminal window.	2015-06-25 18:17:10 +00:00
James Booth	fed55b5459	Do not update UI whilst receiving password	2015-06-25 00:33:28 +01:00
James Booth	524c7a8671	Free account on pgp presence send	2015-06-24 22:02:29 +01:00
James Booth	7f17fd2e48	Merge pull request #583 from pasis/jid-memleak ... Fixed memory leak in jid_create()	2015-06-24 22:00:02 +01:00
Dmitry Podgorny	89b76400c8	jid: Fixed memory leak in jid_create()	2015-06-24 20:42:20 +00:00
James Booth	ae4c2781e1	Added messaage when account resource changed whilst connected	2015-06-24 21:36:39 +01:00
James Booth	583bccf631	Merge remote-tracking branch 'pasis/stderr-log-handler'	2015-06-24 21:02:21 +01:00
James Booth	240f6a3f79	Fixed various jid and account mem leaks	2015-06-24 20:53:04 +01:00
James Booth	626ab51ed4	free account after account connect	2015-06-24 20:24:39 +01:00
James Booth	48a2cad8fd	free muc autocompleter result	2015-06-24 20:20:55 +01:00
James Booth	026b0885b5	Merge remote-tracking branch 'pasis/prefs-alloc'	2015-06-24 20:14:00 +01:00
James Booth	2becd9170e	Merge remote-tracking branch 'pasis/gpgme-h-check'	2015-06-24 19:34:59 +01:00
James Booth	ac454fb1cc	Removed NULL checks when not required	2015-06-24 19:19:44 +01:00
Dmitry Podgorny	6325e4f64d	pgp: Added include config.h ... gpgme.h checks _FILE_OFFSET_BITS macro and it's set at config.h	2015-06-24 14:21:28 +00:00
James Booth	17919298f7	Free prefs strings, check for NULLs when closing pgp module	2015-06-24 14:27:40 +01:00
Dmitry Podgorny	592cf2c69b	prefs: Don't mix allocator types	2015-06-24 12:50:04 +00:00
James Booth	8eb921e34a	Merge remote-tracking branch 'pasis/ui-log-fix'	2015-06-23 23:37:52 +01:00
James Booth	d89a9862b1	Merge remote-tracking branch 'pasis/pgp-without-otr-fix'	2015-06-23 23:32:41 +01:00
James Booth	358e9d6af0	Added /pgp setkey command	2015-06-23 23:29:10 +01:00
Dmitry Podgorny	6a73ca1b52	pgp: Fixed compilation error when libotr is not supported	2015-06-23 22:13:50 +00:00
Dmitry Podgorny	02cd8d2330	ui: decreased log level of the message on resizing ... Resizing of terminal window can produce many logs "Resizing UI". Also they are not so informative to be shown without -l DEBUG.	2015-06-23 22:03:09 +00:00
Dmitry Podgorny	e831410669	log: Introduced stderr log handler ... This handler redirects stderr output to a pipe and gathers logs from the read end. The handler is called from main loop, therefore, if a function prints logs to stderr they will be put to log file only after function returns.	2015-06-23 20:52:04 +00:00
James Booth	86acd4649b	Added PGP prefs	2015-06-22 21:09:14 +01:00
Dmitry Podgorny	c851a48af2	shutdown: Call prefs_close() after log_close() ... log_msg() uses prefs, so prefs_close() should be called after log_close(). It makes possible to use logs in other finalisation functions.	2015-06-22 11:43:12 +00:00
James Booth	918e55becf	Fixed pgp help	2015-06-21 22:29:15 +01:00
James Booth	9526f2b7eb	Fixed /pgp help formatting	2015-06-21 22:06:27 +01:00
James Booth	3d2f999efb	Added PGP logging preferences	2015-06-21 21:42:58 +01:00
James Booth	446027b950	Moved setting otr.warn -> enc.warn	2015-06-21 21:07:57 +01:00
James Booth	e72ddf5488	Show message when contact ends PGP	2015-06-21 20:27:56 +01:00
James Booth	217fcff420	Added /pgp end command	2015-06-21 20:20:28 +01:00
James Booth	f81652e84e	Added enc_mode check when starting OTR	2015-06-21 20:13:28 +01:00
James Booth	5669799690	Encryption modes for sv_ev_incoming_message	2015-06-21 20:08:46 +01:00
James Booth	03a4aa4408	Tidied OTR and PGP combinations in client_events.c	2015-06-21 19:29:23 +01:00
James Booth	13a612cbc2	Moved window creation to sv_ev_incoming_message	2015-06-21 18:29:20 +01:00
James Booth	8d2d923603	Moved message display logic to sv_ev_incoming_message	2015-06-21 18:00:57 +01:00
James Booth	9b991ae058	Extracted chat session code from message senders	2015-06-21 17:11:23 +01:00
James Booth	e45afd5c09	Added pgp checks for message sending	2015-06-21 01:48:25 +01:00
James Booth	6617bb5a2b	Added window encyption mode for PGP	2015-06-20 23:49:24 +01:00
James Booth	16999a3964	Merge branch 'master' into openpgp	2015-06-20 00:39:08 +01:00
James Booth	d7ec339e3e	Added /roster empty command	2015-06-20 00:38:28 +01:00
James Booth	edbb3d938e	Merge branch 'master' into openpgp	2015-06-19 00:15:40 +01:00
James Booth	e117c0368f	Added missing include client_events.c	2015-06-19 00:14:48 +01:00
James Booth	ea99012d9b	Added initial /pgp start checks	2015-06-18 01:34:27 +01:00
James Booth	85cc5ab50d	Added cmd_pgp tests	2015-06-18 00:12:01 +01:00
James Booth	97ba9d2692	Merge branch 'master' into openpgp	2015-06-17 20:06:13 +01:00
James Booth	f51a26e6a0	Merge remote-tracking branch 'quite/#513'	2015-06-17 20:05:27 +01:00
James Booth	1af3565cbd	Merge branch 'master' into openpgp	2015-06-17 19:55:52 +01:00
James Booth	e00a03f916	Removed wins_get_current_* functions	2015-06-17 19:49:55 +01:00
James Booth	8fde14879a	Merge branch 'master' into openpgp ... Conflicts: src/command/commands.c src/command/commands.h	2015-06-17 00:40:06 +01:00
James Booth	a798dc5618	Removed unused function prototype	2015-06-17 00:18:59 +01:00
James Booth	2215a3791f	Added current window reference to command functions	2015-06-17 00:15:28 +01:00
James Booth	cfef64c767	Pass current window to autocompleters	2015-06-16 22:59:08 +01:00
Daniel	d00d71f245	Let's only strip trailing whitespace when parsing command ... Allows for "quoting" a command--doing nothing but sending the string: SPC/command As we're used to from for example irc clients. Fixes boothj5/profanity#513	2015-06-16 09:46:02 +02:00
James Booth	637b8bee9f	Merge branch 'master' into openpgp	2015-06-15 23:17:11 +01:00
James Booth	fb0e065902	Tidied cmd_otr, added check-unit target to Makefile	2015-06-15 23:16:22 +01:00
James Booth	de47450594	Merge branch 'master' into openpgp	2015-06-15 22:03:25 +01:00
James Booth	6097a5bade	Removed ui_get_current_chat()	2015-06-15 22:01:28 +01:00
James Booth	c76692516a	Merge branch 'master' into openpgp	2015-06-15 20:39:17 +01:00
James Booth	5cdd69f478	Moved UI interfaces to ui.h	2015-06-15 20:11:34 +01:00
James Booth	38ed9188d3	Moved ui/windows -> window_list	2015-06-15 19:26:28 +01:00
James Booth	6b44b988f4	Moved refresh subwin logic to window.c	2015-06-15 18:59:20 +01:00
James Booth	989dde77cd	Added win_resize() function	2015-06-15 18:08:47 +01:00
James Booth	a849b200b3	Added win_clear() function	2015-06-15 17:54:47 +01:00
James Booth	e9aa4ea084	Removed unused variable	2015-06-15 17:40:22 +01:00
James Booth	732533ee5a	I removed ncurses header dependencies, removed unused code	2015-06-15 17:11:11 +01:00
James Booth	10a5f29023	Merge branch 'master' into openpgp	2015-06-14 00:02:00 +01:00
James Booth	e50461a897	Set columns when running functional tests	2015-06-13 23:59:33 +01:00
James Booth	0ef00e87ab	Merge branch 'master' into openpgp	2015-06-13 16:27:20 +01:00
James Booth	698288ab5c	Show message when offline for /pgp fps	2015-06-13 01:19:56 +01:00
James Booth	e0783e20db	Renamed otr trusted window property	2015-06-13 01:13:56 +01:00
James Booth	a408ca7326	Removed TODO in gpg.c	2015-06-13 00:35:53 +01:00
James Booth	abcf67044c	Merge branch 'master' into openpgp	2015-06-08 20:33:03 +01:00
James Booth	549fceaa7f	Set default autoaway mode to off ... fixes #555	2015-06-08 20:26:23 +01:00
James Booth	9aff8abd2e	Merge branch 'master' into openpgp ... Conflicts: .travis.yml	2015-06-05 23:02:56 +01:00
James Booth	78a4446023	Merge branch 'master' into stabber-tests	2015-06-02 20:32:15 +01:00
James Booth	a3693cfbe7	Merge branch 'master' into openpgp	2015-06-02 20:32:07 +01:00
James Booth	f0f3a739f4	Merge remote-tracking branch 'PMaynard/#551'	2015-06-02 20:29:35 +01:00
Pete	a0a7d04a5f	Tidy up windows when enabling	2015-06-01 14:47:02 +01:00
Pete	e8eb23c4f0	Merge branch '#551' of github.com:PMaynard/profanity into #551	2015-06-01 11:45:22 +01:00
Pete	2ce35fe61c	Added Theme UI option for window auto tidy	2015-06-01 11:44:52 +01:00
Pete Maynard	7bc671e07c	Extra underline	2015-06-01 11:33:19 +01:00
Pete	0564976264	Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected underline, removed call to function 'wins_resize_all()'.	2015-06-01 11:27:01 +01:00
Will Song	837f8b1f10	add examples and be more specific about time formatting	2015-05-30 00:42:19 -05:00
Will Song	83bed119e4	remove memory leak from creating a gdatetime string	2015-05-29 20:55:33 -05:00
Will Song	0e7507a1aa	update autocomplete	2015-05-29 20:49:28 -05:00
Will Song	3842daa334	fix indent code	2015-05-29 20:45:10 -05:00
Will Song	f2629aca7b	updated statusbar to use strftime formats	2015-05-29 20:23:09 -05:00
Will Song	9463c67190	fix conflicts	2015-05-29 19:53:37 -05:00
Pete	fbc57765a3	Added window auto tidy.	2015-05-29 14:25:14 +01:00
James Booth	e4ad201324	Merge branch 'master' into stabber-tests	2015-05-25 21:17:06 +01:00
James Booth	06fe9bec37	Merge branch 'master' into openpgp	2015-05-25 21:16:51 +01:00
James Booth	304e08a9c0	Added jid to OTR errors in console	2015-05-25 21:16:10 +01:00
James Booth	e295a474dc	Added more connect tests	2015-05-24 20:31:18 +01:00
James Booth	80665ea051	Added rooms iq test	2015-05-24 04:13:28 +01:00
James Booth	2241473ee6	Added bad password test	2015-05-24 00:56:13 +01:00
James Booth	09f01d518c	Merge branch 'master' into stabber-tests	2015-05-17 22:28:25 +01:00
James Booth	34d9b2b272	Merge branch 'master' into openpgp	2015-05-17 22:28:12 +01:00
James Booth	2c5b44421e	Added initial stabber test	2015-05-17 22:05:43 +01:00
Adam Ehlers Nyholm Thomsen	882ca85aca	allow enabling / disabling carbons without being connected.	2015-05-17 13:29:08 +02:00
James Booth	7f861b7743	Removed libgpg include from presence.c	2015-05-10 23:54:48 +01:00
James Booth	58b5e39b95	Merge branch 'master' into openpgp	2015-05-10 01:45:07 +01:00
James Booth	aeffca496c	Tidy ui_room_message	2015-05-10 01:44:34 +01:00
James Booth	487f5da17d	Merge branch 'master' into openpgp	2015-05-10 01:08:30 +01:00
James Booth	aaad3ff909	Moved logic to notify_message	2015-05-10 01:03:34 +01:00
James Booth	acd2d2309f	Moved pgp signature generation to cl_ev_presence_send	2015-05-08 00:07:21 +01:00
James Booth	0db7bcbdcd	Merge branch 'master' into openpgp	2015-05-07 23:23:45 +01:00
James Booth	d853284f92	Added cl_ev_presence_send	2015-05-07 23:21:48 +01:00
James Booth	a2281dbccf	Merge branch 'master' into openpgp	2015-05-07 23:16:22 +01:00
James Booth	56cbce2ff3	Renamed presence_update -> presence_send	2015-05-07 23:12:49 +01:00
James Booth	beeadd6ae3	Merge branch 'master' into openpgp	2015-05-07 22:51:42 +01:00
James Booth	f69ccbf0cc	Tidied _roster_result_handler	2015-05-07 22:51:35 +01:00
James Booth	8ebc1d4ac1	Moved pgp signature verification to sv_ev_contact_online	2015-05-07 22:22:28 +01:00
James Booth	8673488368	Merge branch 'master' into openpgp	2015-05-07 22:06:02 +01:00
James Booth	a2c6211732	Added ui_contact_online	2015-05-07 22:05:36 +01:00
James Booth	8c347de298	Merge branch 'master' into openpgp	2015-05-07 00:26:45 +01:00
James Booth	6fd9b179a0	Optimised occupant comparisons, create utf8 collate key once	2015-05-07 00:26:24 +01:00
James Booth	ca3f7412f5	Optimised contact comparisons, create utf8 collate key once	2015-05-07 00:16:22 +01:00
James Booth	6840f3b599	Merge branch 'master' into openpgp	2015-05-06 22:04:47 +01:00
James Booth	5067e565e3	Set ui nonblocking on presence updates ... Speeds up joining rooms, and connecting.	2015-05-06 22:02:50 +01:00
James Booth	c9e21a557e	Merge branch 'master' into openpgp	2015-05-05 00:51:16 +01:00
James Booth	d52f86ef0f	Tidied form field autocompleters	2015-05-05 00:13:41 +01:00
James Booth	44aa2fd1bf	Use null check convention in gpg.c	2015-05-04 23:41:22 +01:00
James Booth	3fd9692aec	Merge branch 'master' into pgp	2015-05-04 23:40:58 +01:00
James Booth	6f3750c6aa	Use null check convention in roster_list.c	2015-05-04 23:31:05 +01:00
James Booth	59788752c7	Use null check convention in resource.c	2015-05-04 23:29:53 +01:00
James Booth	0930f0f688	Use null check convention in profanity.c	2015-05-04 23:29:24 +01:00
James Booth	41724218c0	Use null check convention in log.c	2015-05-04 23:28:34 +01:00
James Booth	4c78534be0	Use null check convention in jid.c	2015-05-04 23:27:41 +01:00
James Booth	1bfaa49fb3	Use null check convention in contact.c	2015-05-04 23:26:57 +01:00
James Booth	1d002e5bdc	Use null check convention in common.c	2015-05-04 23:26:08 +01:00
James Booth	49e450767d	Use null check convention in chat_session.c	2015-05-04 23:24:37 +01:00
James Booth	c487fe5f77	Use null check convention in stanza.c	2015-05-04 23:23:55 +01:00
James Booth	defa955ae0	Use null check convention in roster.c	2015-05-04 23:22:06 +01:00
James Booth	8e64323503	Use null check convention in presence.c	2015-05-04 23:21:06 +01:00
James Booth	8e2578459e	Use null check convention in iq.c	2015-05-04 23:19:10 +01:00
James Booth	cbcf476a7c	Use null check convention in form.c	2015-05-04 23:17:18 +01:00
James Booth	af75bc4be6	Use null check convention in connection.c	2015-05-04 23:16:44 +01:00
James Booth	067ad7fa2c	Use null check convention in capabilities.c	2015-05-04 23:15:15 +01:00
James Booth	398eac4ed6	Use null check convention in bookmark.c	2015-05-04 23:14:18 +01:00
James Booth	a71d1dab6a	Use null check convention in windows.c	2015-05-04 23:12:55 +01:00
James Booth	c19a05ca09	Use null check convention in window.c	2015-05-04 23:11:32 +01:00
James Booth	dd386b4a4e	Use null check convention in titlebar.c	2015-05-04 23:08:09 +01:00
James Booth	bf5646aee3	Use null check convention in statusbar.c	2015-05-04 23:07:36 +01:00
James Booth	dda812cd3e	Use null check convention in notifier.c	2015-05-04 23:06:35 +01:00
James Booth	aefe458b60	Use null check convention in core.c	2015-05-04 23:05:52 +01:00
James Booth	2e2b3f9403	Use null check convention in console.c	2015-05-04 23:02:57 +01:00
James Booth	09e1e7618e	Use null check convention in tinyurl.c	2015-05-04 22:57:49 +01:00
James Booth	fe216b4e97	Use null check convention in parser.c	2015-05-04 22:57:19 +01:00
James Booth	fa2e33e11d	Use null check convention in otrlibv4.c	2015-05-04 22:55:28 +01:00
James Booth	2426a7fcfc	Use null check convention in otrlibv3.c	2015-05-04 22:55:04 +01:00
James Booth	a979d23e10	Use null check convention in otr.c	2015-05-04 22:52:48 +01:00
James Booth	4dc9033472	Use null check convention in server_events.c	2015-05-04 22:51:15 +01:00
James Booth	4ba33005d0	Use null check convention in theme.c	2015-05-04 22:33:55 +01:00
James Booth	b093b99c15	Use null check convention in preferences.c	2015-05-04 22:33:19 +01:00
James Booth	a293045d85	Use null check convention in accounts.c	2015-05-04 22:32:42 +01:00
James Booth	47549452f1	Use null check convention in account.c	2015-05-04 22:29:51 +01:00
James Booth	4acf853b1c	Use null check convention in commands.c	2015-05-04 22:23:59 +01:00
James Booth	2b3cc65b52	Use null check convention in command.c	2015-05-04 22:16:39 +01:00
James Booth	176fba84a0	Merge branch 'master' into pgp	2015-05-04 21:39:56 +01:00
James Booth	8ccbeade44	Added enc_mode to ProfChatWin	2015-05-04 21:38:19 +01:00
James Booth	65ea572dae	Merge branch 'master' into pgp	2015-05-04 21:31:22 +01:00
James Booth	a0c872edf8	Extracted carbons handling	2015-05-04 21:31:05 +01:00
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
James Booth	f219302f06	Renamed incoming otr message	2015-04-27 22:34:06 +01:00
James Booth	7a44e17141	Merge branch 'master' into pgp ... Conflicts: src/config/account.h	2015-04-23 23:48:43 +01:00
James Booth	bc9e6b79cd	Tidied account login	2015-04-23 21:56:48 +01:00
James Booth	5f2c6cbd28	Merge branch 'master' into pgp	2015-04-22 00:30:00 +01:00
James Booth	ba286c54ef	Moved login events to client events module	2015-04-22 00:29:37 +01:00
James Booth	1c47b57e19	Tidy execute alias code	2015-04-21 23:45:03 +01:00
James Booth	bc445ccdfb	Merge branch 'master' into pgp	2015-04-21 23:35:37 +01:00
James Booth	88739d5c59	Moved new chat win events to client events module	2015-04-21 23:28:52 +01:00
James Booth	ebca38e224	Merge branch 'master' into pgp	2015-04-21 22:08:00 +01:00
James Booth	53f2a4a35c	Moved all message sending to client events module	2015-04-21 21:57:39 +01:00
James Booth	65c0a87f97	Merge branch 'master' into pgp	2015-04-21 20:56:47 +01:00
James Booth	a4f9661da2	Removed unused otr check	2015-04-19 21:03:20 +01:00
James Booth	9be265591a	Merge branch 'master' into pgp	2015-04-19 19:50:19 +01:00
James Booth	32da6548da	Added client_events module, reuse message sending code for all commands	2015-04-19 19:40:15 +01:00
James Booth	d612b9695a	Merge branch 'master' into pgp ... Conflicts: src/xmpp/message.c	2015-04-19 17:33:35 +01:00