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

2659 Commits

Author SHA1 Message Date
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