1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Commit Graph

440 Commits

Author SHA1 Message Date
Will Song
1264265691
fix a potential leak 2015-01-12 23:00:03 -06:00
Will Song
b1f79b9d35
add a memory check just in case 2015-01-12 22:51:00 -06:00
Will Song
b6536ddf88
fix tests 2015-01-12 22:39:12 -06:00
Will Song
c2758616d8
eval_password code is now in cmd_connect so that it can be changed
without clearing it. eval_password errors are also now ignored, along
with pclosing the popened eval_password.
2015-01-12 22:23:36 -06:00
James Booth
21f8b1c4ca Merge remote-tracking branch 'peterlvilim/keyring' 2015-01-13 00:41:56 +00:00
James Booth
a39ac6cd07 Merge remote-tracking branch 'savar/dynamic_input_block' 2015-01-12 23:41:15 +00:00
Simon Effenberg
34148e2101 adding preference option for dynamic input blocking
/inpblock is now having subcommands 'timeout' and 'dynamic'
with:

/inpblock timeout <milliseconds>

and

/inpblock dynamic <on|off>

Defaults are:

/inpblock timeout 500
/inpblock dynamic on

To get the old behavior specify:

/inpblock timeout 20
/inpblock dynamic off

The dynamic mode will block incrementally after something
should be written to the window or after a key was pressed. So pressing
a key would set the timeout to 0ms and after 10 timeouts to the next
bigger one.

Example (with dynamic mode on):

"/inpblock timeout 50"

timeout series:

10x 0ms
10x 10ms (0ms + 10 times since last keypress)
10x 30ms (10ms + 20 times since last keypress)
*x50ms until next key was pressed or
2015-01-12 11:32:32 +01:00
Simon Effenberg
c7ff3255b8 trying to block (and save cpu power) more dynamically
instead of blocking too long if inpblock is set to something like
500ms the input timeout is not set directly to inpblock but is
increasing dynamically from 0 to inpblock by a little algorithm

FIXME: the call from the win_* method to the ui_input_* method looks
wrong.. this causes a cross reference which shouldn't be
2015-01-12 08:08:07 +01:00
James Booth
0d0ed9b7ca Merge remote-tracking branch 'incertia/exit-title'
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
2015-01-12 01:12:42 +00:00
James Booth
c64484c6ed Renamed titlebar preference 2015-01-12 00:43:42 +00:00
James Booth
13f0166aa0 Only show UI events for chat states when in session 2015-01-11 23:04:22 +00:00
James Booth
965e82b350 Added resource override for chat sessions 2015-01-10 21:07:40 +00:00
James Booth
31c0f2ba78 Added preferences for showing resource in titlebar and messages 2015-01-10 19:10:10 +00:00
James Booth
3e1832b02e Renamed resource -> resource_override 2015-01-10 18:17:10 +00:00
Will Song
e57fa1633a add exit title preference to group and add command for setting the preference 2015-01-08 10:18:29 -06:00
Peter Vilim
492c548aa6 Add support for evaluated password 2015-01-07 02:54:42 -06:00
James Booth
8326c8b3a2 Refactored chat session handling on sending message 2015-01-04 23:40:10 +00:00
James Booth
42a5c431c7 Use resource in chat sessions 2015-01-04 20:19:42 +00:00
James Booth
aebee209b2 Merge remote-tracking branch 'incertia/connect-default'
Conflicts:
	CHANGELOG
2014-12-29 15:29:28 +00:00
James Booth
671ee0b876 Added chat_session_on_window_open 2014-12-28 23:56:48 +00:00
James Booth
ac4b59eda0 Fixed chat state for non OTR 2014-12-28 22:45:25 +00:00
James Booth
53ecd3b383 Merge branch 'master' into chat-sessions 2014-12-27 00:58:33 +00:00
James Booth
3b95946083 Fixed /info command in rooms 2014-12-27 00:56:39 +00:00
James Booth
e602c2909e Moved chat states out of xmpp module for message send chat 2014-12-27 00:52:34 +00:00
James Booth
676ed1cbae Fixed non OTR compilation 2014-12-25 01:18:45 +00:00
Will Song
eb2986d531 added warning about options not being used 2014-12-21 20:09:55 -06:00
James Booth
86dc29d8e8 Removed functions from window.c 2014-12-22 00:01:43 +00:00
James Booth
0c1bbb63c0 Added win_get_title 2014-12-21 22:01:56 +00:00
James Booth
9a322a028f Use class instead of base pointer 2014-12-21 19:40:15 +00:00
James Booth
13f73a30e7 Added /inpblock command 2014-12-21 18:15:29 +00:00
James Booth
39aae7f548 Removed TODOs 2014-12-20 18:48:35 +00:00
James Booth
6800bf1cad Fixed tests 2014-12-20 18:39:39 +00:00
James Booth
ea267e2017 Refactored all window recipients and types
Tests need fixing
2014-12-20 00:52:35 +00:00
James Booth
0146e62576 Refactoring window types, removing recipient and from references - wip 2014-12-18 23:57:19 +00:00
James Booth
48ec7b3b47 Moved roster functions 2014-12-16 23:00:05 +00:00
James Booth
630fef015d Added new window and layout types 2014-12-16 01:39:47 +00:00
James Booth
65c9c3a7fc Allow params to /bookmark when in a room 2014-12-14 19:57:29 +00:00
James Booth
742748b05c Renamed chat_resource -> resource 2014-12-10 21:17:31 +00:00
James Booth
706f31422d Moved chat resource to WIN_CHAT type 2014-12-10 01:44:32 +00:00
James Booth
7b44ac97cc Added form to WIN_MUC_CONFIG type 2014-12-10 01:14:11 +00:00
James Booth
eeb6e6b8fc Use selected resource for sending messages 2014-12-03 23:36:39 +00:00
James Booth
1a8c805319 Added /resource command 2014-12-02 20:50:21 +00:00
James Booth
e756daf2be Fixed closing window 0 2014-12-01 23:15:22 +00:00
James Booth
8fee155797 Automatically add/remove '/' when adding and removing aliases 2014-11-30 23:34:54 +00:00
Will Song
6a3285795a removing the account connected to the default account removes the default account as well 2014-11-27 20:26:10 -06:00
Will Song
3b13c00df4 /connect supports default account 2014-11-27 13:18:54 -06:00
Will Song
de9e621bb7 add default account property and commands associated with them 2014-11-27 11:42:23 -06:00
James Booth
ed228ebb59 Merge remote-tracking branch 'incertia/master' 2014-11-24 00:54:51 +00:00
James Booth
679513ae73 Merge remote-tracking branch 'incertia/account-remove' 2014-11-24 00:38:22 +00:00
James Booth
d1c5cfefb6 Free contact list on /who 2014-11-24 00:32:30 +00:00
Will Song
be031bbe54 implement account removal 2014-11-23 15:53:13 -06:00
Will Song
915c3633e8 implement account removal 2014-11-23 15:37:10 -06:00
Will Song
a980fbe0bd add nooffline option to roster 2014-11-23 01:34:09 -06:00
James Booth
20fa96325d Added [ui] preferences to themes 2014-11-19 23:58:55 +00:00
James Booth
1d5ac1b474 Added /theme colours command 2014-11-17 21:10:08 +00:00
James Booth
976e5aac0a Added support for bold theme settings 2014-11-16 21:56:19 +00:00
James Booth
ed4391ec8a Replaced colours with theme_item_t 2014-11-16 20:40:19 +00:00
James Booth
cd855d3740 Added /time off 2014-11-16 01:28:41 +00:00
James Booth
40dc8e2c49 Added /time setting 2014-11-16 00:40:54 +00:00
James Booth
1479a5e134 Added /roster size and /occupants size settings 2014-11-15 23:47:27 +00:00
James Booth
a45cb4bb3c Added /roster by commands, wip 2014-11-11 00:30:29 +00:00
James Booth
eace543da5 Added /roster show|hide resource 2014-11-11 00:00:10 +00:00
James Booth
f715c0580c Added /roster show|hide offline 2014-11-10 23:51:13 +00:00
James Booth
497b07c1c3 Added /roster show|hide command, only show roster on connect success 2014-11-10 23:23:02 +00:00
James Booth
46583839df Added /wrap user preference for enabling/disabling word wrapping 2014-11-09 23:29:25 +00:00
James Booth
373b3a2d7c Added /presence command to show contacts presence 2014-11-07 22:38:34 +00:00
James Booth
74a2d4601f Removed hash_table_iter usage for room roster 2014-11-03 21:27:41 +00:00
James Booth
c4412fe823 Fixed various memory leaks 2014-11-01 01:48:36 +00:00
James Booth
b6c116e8b6 Updated help 2014-10-27 20:52:45 +00:00
James Booth
5fc35bd6a6 Changed room help colour, added whitespace after invalid field setting 2014-10-24 00:21:00 +01:00
James Booth
0b61c75969 Removed room unlocked console message 2014-10-24 00:00:37 +01:00
James Booth
c014bb34b3 Renamed room destroy function 2014-10-23 23:33:12 +01:00
James Booth
84765969e0 Added /account clear [account] port 2014-10-23 23:12:15 +01:00
James Booth
552d88b931 Added /account clear [account] server 2014-10-23 23:07:27 +01:00
James Booth
7a88898a21 Implemented new field commands 2014-10-19 03:27:34 +01:00
James Booth
04a6504689 Remove fields from command autocomplete on form submit/cancel 2014-10-18 23:56:10 +01:00
James Booth
bbf807ea97 Fixed message on /ban in private conversations 2014-10-18 20:35:23 +01:00
James Booth
fc049c9eef Added /privileges command to set UI option for showing roles/affiliations in rooms 2014-10-18 20:22:34 +01:00
James Booth
014f0f7a91 Don't show join messages on subsequent /join commands 2014-10-18 00:40:44 +01:00
James Booth
48929aa92e Removed /help other 2014-10-18 00:18:10 +01:00
James Booth
9f2f54b2a0 Removed /duck command 2014-10-18 00:07:48 +01:00
James Booth
da373e9097 Added validation to /role and /affiliation 2014-10-12 01:32:15 +01:00
James Booth
77684cda00 Allow /role list and /affiliation list with no args 2014-10-12 01:10:46 +01:00
James Booth
8b1d0bdc3f Added /affiliation and /role commands 2014-10-12 00:43:58 +01:00
James Booth
c66d03539d Removed /room info command, covered by /info 2014-10-11 23:37:04 +01:00
James Booth
8b77f527c0 Moved /room subject to /subject 2014-10-11 23:13:56 +01:00
James Booth
9054427144 Moved /room ban to /ban 2014-10-11 23:13:22 +01:00
James Booth
02a4beb6fe Moved /room kick to /kick 2014-10-10 13:35:50 +01:00
James Booth
3615736762 Renamed args to /occupants default 2014-10-09 22:39:57 +01:00
James Booth
778a495fbd Added /occupants commands, unfinished 2014-10-09 13:16:36 +01:00
James Booth
3228746827 Added /room ban command 2014-10-06 23:17:40 +01:00
James Booth
965f048b18 Implemented setting and listing roles 2014-10-06 21:42:09 +01:00
James Booth
2aeaad230e Allow setting "none" affiliation 2014-10-06 00:38:29 +01:00
James Booth
ac7bc02c63 Added /room kick command 2014-10-05 03:52:55 +01:00
James Booth
7584ddaa62 Added /room subject command 2014-10-05 03:05:46 +01:00
James Booth
2026ab4b6e Implemented getting affiliation list, and setting affiliation 2014-10-05 01:39:48 +01:00
James Booth
0b78a9a57e Implemented setting affiliation and listing affiliations 2014-10-04 23:40:36 +01:00
James Booth
719dbfaacc Split autocompleters for roster and rooms 2014-10-04 22:43:22 +01:00
James Booth
2d05601259 Split validation between /who for rooms and roster 2014-10-04 21:53:04 +01:00
James Booth
58fb89ad33 Allow adding and removing room owners 2014-10-04 21:38:31 +01:00
James Booth
25b04537e1 Added service discovery to /room info command 2014-10-02 23:37:10 +01:00
James Booth
44764e12dd Merge branch 'master' into muc_roles 2014-10-02 01:01:38 +01:00
James Booth
92a0aba93f Removed usages of strcpy 2014-10-02 00:57:29 +01:00
James Booth
c90f4a37a3 Added /room <affiliation> command 2014-10-01 00:46:58 +01:00
James Booth
5879f497ad Added /room <role> command 2014-10-01 00:27:25 +01:00
James Booth
76d2b9e9b5 Moved room info output to ui module, added TODO for roles 2014-09-30 23:08:48 +01:00
James Booth
7ec0dd0b83 Show occupants affiliation and role with /info in rooms 2014-09-30 21:58:18 +01:00
James Booth
4f7feedb65 Changed rooms to use Occupant type instead of PContact 2014-09-30 00:16:01 +01:00
James Booth
d25d6b4502 Tidied muc module 2014-09-28 22:09:20 +01:00
James Booth
41b49cb5d6 Store room affiliation and role 2014-09-28 01:55:24 +01:00
James Booth
f04ed28886 Fixed /caps command for chat room participants 2014-09-21 23:05:27 +01:00
James Booth
ce43af616e Destroy Jid after use 2014-09-21 02:21:52 +01:00
James Booth
60eedc7c6d Added field updated message, show form mofified indicator for /wins 2014-09-17 00:49:06 +01:00
James Booth
0d9a145d45 Implemented /form help 2014-09-16 20:52:38 +01:00
James Booth
f494faac99 Show form fields after updating 2014-09-15 23:28:12 +01:00
James Booth
6b575aa8fc Added /form show 2014-09-15 22:51:53 +01:00
James Booth
c5b697dba7 Dont allow unsaved form windows to be closed 2014-09-15 22:31:15 +01:00
James Booth
529b4f175b Split /room and /form commands 2014-09-15 21:33:25 +01:00
James Booth
de0ce0b80d Allow removing data from text-multi form fields 2014-09-14 18:36:44 +01:00
James Booth
8cfe80e979 Added setting of unique form list values 2014-09-14 16:23:25 +01:00
James Booth
7a12684523 Added /room remove command, reformetted form output 2014-09-14 01:53:52 +01:00
James Booth
68b839a508 Added /room add for *-multi 2014-09-14 00:18:06 +01:00
James Booth
b52911f7b4 Added add/remove subcommands to room config 2014-09-13 23:45:56 +01:00
James Booth
0239a81c38 Added form validation for jid-single type 2014-09-13 23:32:09 +01:00
James Booth
e13940daf4 Added form validation for list-single type 2014-09-13 23:07:52 +01:00
James Booth
524a52d0ac Added form validation for boolean type 2014-09-13 22:49:04 +01:00
James Booth
b111419693 Added form type check on set 2014-09-13 22:39:06 +01:00
James Booth
6c45f8ffae Check room config tag exists before setting 2014-09-12 00:39:37 +01:00
James Booth
38959e0c33 Added setting of *-single room config values 2014-09-12 00:21:28 +01:00
James Booth
a133384ef7 Close config win 2014-09-11 23:23:13 +01:00
James Booth
2fc9e3e1cf Close config window on submit/cancel 2014-09-11 00:17:42 +01:00
James Booth
1e26b7a4ff Added /room command validation, reduced to one subcommand 2014-09-11 00:01:44 +01:00
James Booth
eba3a7cb30 Implemented /room config submit for saving room configuration 2014-09-10 23:05:35 +01:00
James Booth
73ae2e54c5 Move to existing room config window if exists 2014-09-08 22:33:48 +01:00
James Booth
1e0e5597c2 Added /room config edit and /room config cancel 2014-09-04 22:29:57 +01:00
James Booth
e55b9dbeff Fixed spelling mistake 2014-09-04 13:31:28 +01:00
James Booth
4ba33cb13c Added /ping command 2014-09-04 01:08:10 +01:00
James Booth
b50b786dcc Validate usage of /room config command, added UI messages 2014-09-03 22:56:33 +01:00
James Booth
aa9f1dfa06 Send room destroy iq on /room config cancel 2014-09-03 20:29:17 +01:00
James Booth
09c10f62f2 Send instant room request 2014-09-03 13:55:06 +01:00
James Booth
d7b3e99a27 WIP - Handle /room config commands 2014-09-03 00:58:20 +01:00
James Booth
52a9ab6909 Added /room config command 2014-09-03 00:36:42 +01:00
James Booth
bc3c4e09a1 Always update UI in event loop, removed updates from rest of code 2014-09-01 19:14:52 +01:00
James Booth
f9737251a6 Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
James Booth
7bac097d60 Added /bookmark with no args usage when in chat room
issue #402
2014-08-19 22:52:04 +01:00
Jan Hacker
e87eb4c40e "/bookmark add foo" crash - fix
A user providing an invalid JID when creating a new bookmark (like 'foo')
would reproducibly crash/segfault profanity, as it insists on checking
string length behind the @ of the JID. However, it could be NULL
if the user accidentally omitted it.
The patch avoids the crash by NULL-checking and prevents
getting there in the first place by checking the argument to "add".
Backtrace of unpatched profanity with above command:

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000
0x00007fff85699732 in strlen ()
(gdb) bt
 #0  0x00007fff85699732 in strlen ()
 #1  0x00000001000965d2 in xmpp_strdup ()
 #2  0x0000000100095d6d in xmpp_stanza_set_attribute ()
 #3  0x0000000100011c5c in _send_bookmarks ()
 #4  0x00000001000115a8 in _bookmark_add ()
 #5  0x000000010003320d in cmd_bookmark ()
 #6  0x000000010002a0f2 in cmd_execute ()
 #7  0x0000000100003a1d in process_input ()
 #8  0x00000001000037c7 in prof_run ()
 #9  0x0000000100045032 in main ()
(gdb)
2014-08-17 22:22:12 +02:00
James Booth
9123675c9c Show message when no group or empty roster on /who 2014-07-22 23:31:14 +01:00
James Booth
fd1d540889 Added _who_roster function 2014-07-22 23:27:36 +01:00
James Booth
6a1975f65b Added _who_room function 2014-07-22 23:22:50 +01:00
James Booth
1aee7ce4bf Show message when no contacts with presence for /who 2014-07-22 23:17:42 +01:00
James Booth
c98ce4299d Free resources on OTR shutdown 2014-06-26 23:55:57 +01:00
James Booth
7344d3b898 Added deallocation function for string prefs, added otr policy enum 2014-06-18 00:32:36 +01:00
James Booth
79ddf10484 Fixed memleaks with otr policy and autoaway options 2014-06-17 23:34:52 +01:00
James Booth
d0fa51fe67 Fixed compiler warning 2014-06-03 21:48:38 +01:00
James Booth
1925cb80ec Show info in chat and private chat windows 2014-06-03 21:35:27 +01:00
James Booth
c65b43f081 Show info in room for participant 2014-06-03 21:20:13 +01:00
James Booth
b36fbe413a Added settings to show message text in notifications 2014-05-24 22:14:26 +01:00
James Booth
b25b3f3180 Added notification setting for typing in current window 2014-05-24 21:13:33 +01:00
James Booth
eb0f0dd96b Added settings for message notifications in current window 2014-05-24 20:46:03 +01:00
James Booth
866d87af79 Added /notify room mention setting 2014-05-24 16:46:05 +01:00
James Booth
7d90d218c0 Split regular and chat room notify settings 2014-05-24 15:54:10 +01:00
James Booth
0166454794 Added config.h to files checking for OTR support 2014-05-19 21:25:21 +01:00
James Booth
e10ea1be4e Fixed OTR dependency when library not present, changed version to 0.4.2 2014-05-19 20:41:19 +01:00
James Booth
9dda7036a9 Implemented per contact OTR policy setting 2014-05-11 19:32:07 +01:00
James Booth
6d955609c5 Added /otr policy for contacts in account preferences 2014-05-11 18:13:04 +01:00
James Booth
3967b26aea Added otr to /account clear properties 2014-05-11 15:32:38 +01:00
James Booth
e8d84abb46 Moved OTR policy check to otr module 2014-05-11 15:03:10 +01:00
James Booth
95ff13136b Added OTR policy account preference 2014-05-11 14:13:15 +01:00
James Booth
f2ebbdb8de Added autocompletion for /account set <account> otr <policy> 2014-05-11 13:48:41 +01:00
James Booth
015780662e Added /prefs otr 2014-05-11 13:32:59 +01:00
James Booth
d2662a6f17 Refactored bookmarks to use option parser, allow bookmarking rooms with passwords 2014-05-10 00:50:43 +01:00
James Booth
a077d2008a Added question answer authentication (libotr 3.2.x) 2014-04-30 23:59:40 +01:00
James Booth
2bc19f4669 Added SMP secret authentication success message 2014-04-27 01:17:38 +01:00
James Booth
aff9eee433 Handle SMP secret response 2014-04-26 22:52:25 +01:00
James Booth
06d81ed9ce Send SMP init message with /otr secret 2014-04-26 22:08:53 +01:00
James Booth
d6e92f62dc Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
James Booth
e9ddbab585 Allow /wins swap to move to empty position 2014-04-24 23:06:42 +01:00
James Booth
547b6cf4da Added command /wins swap 2014-04-24 21:50:59 +01:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
lightb
da89e24172 Added opportunistic send functionality to cmd_msg
If policy is set to 'opportunistic' then when the user executes cmd_msg it will append the otr whitespace tag to the message

The other client should start AKE once it receives the message.

TODO: Analyze incoming messages for whitespace tag
2014-04-21 18:03:07 -04:00
James Booth
2c15aba92a Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00
lightb
1ceca89296 Added some otr policy functionality, if policy is set to "always"
if otr_is_secure fails, the message will not be sent.

Changed both cmd_msg and cmd_execute_default
2014-04-19 05:08:33 -04:00
lightb
a687e3f6b4 Added /otr policy to commands (still need to add autocomplete stuff?) 2014-04-19 04:18:53 -04:00
lightb
02b77cfa4e Added PREF_OTR_POLICY to preferences.c -> key -> otr.policy
Added default value "manual" to PREF_OTR_POLICy -> preferences.c
Modified help string to reflect otr_policy, started checks on cmd_otr
2014-04-19 04:00:41 -04:00
James Booth
e6e0a13e89 Added XML Console window 2014-04-15 13:16:32 +01:00
James Booth
40759eddbf Simplified parse_options to take first option as argument 2014-04-15 00:27:55 +01:00
James Booth
4425aba1f2 Simplified parse_options to take gchar** 2014-04-15 00:13:32 +01:00
James Booth
79088d0150 Clean up keys after using parse_options 2014-04-14 23:41:45 +01:00
James Booth
3e69d6b71e Refactored cmd_join to use parse_options 2014-04-14 23:36:00 +01:00
James Booth
428d9eb936 Refactored cmd_connect to use parse_options 2014-04-14 23:15:39 +01:00
James Booth
67a109927c Added /log where command 2014-04-13 22:20:15 +01:00
James Booth
c3418a2909 Added /log shared setting
Issue #170
2014-04-13 21:56:51 +01:00
James Booth
a4a23fdf68 Added /log rotate option 2014-04-13 20:41:11 +01:00
James Booth
71180f66d7 Added focus param to ui_room_join, not set for bookmark autojoin
Issue #194
2014-04-13 02:52:25 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected"
This reverts commit e97ec56fce.
2014-04-12 15:20:19 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
f0f0dbfdac Removed statusbar functions from ui.h 2014-04-07 21:12:30 +01:00
James Booth
fc40637789 Removed titlebar functions from ui.h 2014-04-07 20:41:06 +01:00
James Booth
aa2a87d162 Tidied ui dependencies 2014-04-06 21:35:17 +01:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00