1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Commit Graph

1778 Commits

Author SHA1 Message Date
James Booth
2cbe7e4ccb Whitespace formatting 2014-07-16 22:03:46 +01:00
James Booth
aa8872875f Merge branch 'master' into winbuffers
Conflicts:
	src/ui/core.c
2014-07-16 20:03:08 +01:00
James Booth
4624eabb75 Colour chat room messages that contain users nickname 2014-07-16 13:44:16 +01:00
James Booth
5872c4b554 Merge branch 'master' into winbuffers 2014-07-15 23:54:21 +01:00
James Booth
afde9d770a Added ": " after nick autocomplete when start of message 2014-07-15 23:52:08 +01:00
James Booth
f8f02e8f1e Merge branch 'master' into winbuffers 2014-07-15 23:04:16 +01:00
James Booth
d02c8af532 Save chat room message prefix for autocomplete 2014-07-15 22:46:29 +01:00
James Booth
cc62fe376c Finished chat room nick autocomplete 2014-07-15 21:30:23 +01:00
James Booth
2f3234a5f5 Added quote param to autocomplete_param_with_ac 2014-07-09 20:32:28 +01:00
James Booth
954661e59e Added quote param to autocomplete_complete 2014-07-09 20:23:47 +01:00
James Booth
0c9851106b Added quote param to autocomplete searches 2014-07-09 20:15:20 +01:00
James Booth
b3e4731aa9 Fixed room autojoin messages appearing in room 2014-07-09 13:24:32 +01:00
James Booth
4a19e7e82f Merge branch 'master' into winbuffers 2014-07-09 01:06:33 +01:00
James Booth
88180568e0 Removed debug, added check for 0 length string 2014-07-09 01:04:54 +01:00
James Booth
175da6c9a0 Merge branch 'master' into winbuffers 2014-07-09 00:40:31 +01:00
James Booth
4b14c0c484 Added autocomplete for nicknames in MUC input text
issue #321
2014-07-09 00:36:09 +01:00
James Booth
5dda8cd14c Merge branch 'master' into winbuffers 2014-07-08 20:31:39 +01:00
James Booth
06caa0c4f1 Removed empty lines 2014-07-08 20:20:01 +01:00
James Booth
0115d71e25 Added OTR and notification info to --version 2014-07-08 20:18:43 +01:00
James Booth
feaebf59f9 Merge remote-tracking branch 'origin/winbuffers' into winbuffers 2014-07-08 20:03:19 +01:00
James Booth
82d8d81dfb Merge branch 'master' into winbuffers 2014-07-08 20:02:34 +01:00
James Booth
5c28ad76b6 Merge pull request #374 from immae/winbuffers
Implemented the buffer for windows resizing
2014-07-08 19:56:35 +01:00
James Booth
b91f421628 Assign GPOINTER_TO_INT value before freeing
fixes #375
2014-07-07 21:29:51 +01:00
James Booth
c4844a0626 Merge branch 'master' into winbuffers 2014-06-29 19:35:28 +01:00
James Booth
6731a11701 Fixed tabs 2014-06-29 19:33:18 +01:00
James Booth
c454836315 Merge branch 'master' into winbuffers 2014-06-29 19:31:17 +01:00
James Booth
4279735dd7 Reinitialise libnotify per notification
Fixes issue on Xfce4 where notification are not being sent after a period of time.
Issue #370
2014-06-29 19:19:08 +01:00
Immae
945d655910 Implemented the buffer for windows resizing 2014-06-29 15:04:23 +02:00
James Booth
dada879347 Merge branch 'master' into winbuffers
Conflicts:
	src/ui/core.c
2014-06-27 00:52:52 +01:00
James Booth
03ffe57063 Fixed memleak in title bar roster_find_contact 2014-06-27 00:47:11 +01:00
James Booth
186cac34de Fixed memleak in chat log history 2014-06-27 00:38:53 +01:00
James Booth
c98ce4299d Free resources on OTR shutdown 2014-06-26 23:55:57 +01:00
James Booth
8cf7122e7a Use g_list_free() when finding resource availability 2014-06-24 23:08:35 +01:00
James Booth
7872d8e14f Merge branch 'memleak' 2014-06-24 22:25:00 +01:00
James Booth
83fc97621c Check for null before freeing X11info, removed free current resource 2014-06-24 22:23:53 +01:00
James Booth
f0d3653582 Merge branch 'master' into winbuffers 2014-06-24 00:46:40 +01:00
James Booth
98bc1abbe5 Free GError on command line option parse 2014-06-23 21:17:07 +01:00
Immae
6a9e19303e Added buffer handling. Buffer are initialized, pushed, and freed. No use is made of them so far
Signed-off-by: James Booth <boothj5@gmail.com>
2014-06-23 21:05:46 +01:00
Immae
66ad23b35b having wprintw go through win_save_(v)print.
Signed-off-by: James Booth <boothj5@gmail.com>
2014-06-23 21:05:43 +01:00
Immae
5e841febd0 Added horizontal scroll for resized windows
Signed-off-by: James Booth <boothj5@gmail.com>
2014-06-23 20:23:07 +01:00
Immae
c3847eec34 Free some memory 2014-06-23 12:05:49 +02:00
James Booth
d668d15081 Free aliases on cmd_init 2014-06-18 21:36:09 +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
ad68bcfde2 Free keys lists in windows.c 2014-06-17 23:14:54 +01:00
James Booth
ecedca8a95 Free tokens when 0 supplied an 0 min, parse_args_with_freetext 2014-06-17 22:30:51 +01:00
James Booth
acc4a00d78 Free values on wins_get_chat_recipients 2014-06-17 22:27:14 +01:00
James Booth
4a485a64f9 Free account_name preference on autoconnect 2014-06-17 22:22:35 +01:00
James Booth
fa0be4e50e Free titlebar current_recipient when switching to console 2014-06-17 22:05:32 +01:00
James Booth
e2aa4d6fd1 Added valgrind suppressions 2014-06-17 22:01:01 +01:00
James Booth
2f95340c3a Free GError on prefs load 2014-06-17 21:02:48 +01:00
James Booth
235c893f28 Properly free muc hashtables 2014-06-15 22:39:46 +01:00
James Booth
6483bc8d7c Removed string allocation in stanza when joining room 2014-06-15 22:26:28 +01:00
James Booth
1c62d7fda8 Renamed generate_unique_id -> create_unique_id 2014-06-15 21:49:34 +01:00
James Booth
efc833a202 Free string after use in sending caps response 2014-06-15 21:39:54 +01:00
James Booth
d89ac912eb Free list in wins_get_num 2014-06-15 21:36:47 +01:00
James Booth
2c4e2d5dbd Fixed memleak in otr.c 2014-06-15 21:33:29 +01:00
James Booth
258a0ec873 Fix memleak in wins_new 2014-06-15 21:23:21 +01:00
James Booth
c9274a38b2 Free jabber_conn.log 2014-06-15 21:19:53 +01:00
James Booth
bc03e0dc02 Free list in wins_get_by_recipient 2014-06-15 21:04:07 +01:00
James Booth
d6d714e1ed Free saved account details before replacing 2014-06-15 21:00:01 +01:00
James Booth
d181f500ea Fixed usages of get_unique_id to free result 2014-06-15 20:56:24 +01:00
James Booth
ccf5cb846b Added connection details to jabber_shutdown 2014-06-15 20:46:12 +01:00
James Booth
4d0566b5d1 Fixed memleak in _available_handler 2014-06-15 20:39:50 +01:00
James Booth
d4afcd3258 Fixed memleak when leaving rooms 2014-06-15 20:37:03 +01:00
James Booth
92837ec186 Renamed sha1 functions to avoid naming clashes 2014-06-15 19:08:18 +01:00
James Booth
45e3b25fab Fixed memleak in wins_xmlconsole_exists 2014-06-15 17:43:16 +01:00
James Booth
b9b5d6a5f8 Fixed memleak in autocompleter 2014-06-15 17:32:30 +01:00
James Booth
e296379863 Fixed memleak when writing preferences file 2014-06-15 17:19:56 +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
8ae6d359d7 Moved info display code to window.c 2014-06-03 21:14:21 +01:00
James Booth
17c73814ac Made room message notification preference display case consistent 2014-06-02 18:44:06 +01:00
James Booth
21af901fe4 Include stdint 2014-06-01 22:53:30 +01:00
James Booth
575b6acdd2 Use public domain SHA1 code, remove libgcrypt dependency 2014-06-01 22:42:10 +01:00
James Booth
355cd27f6c Added character codes for alt-left, alt-right 2014-05-26 19:53:44 +01:00
James Booth
60b59d984a Escape strings passed to terminal-notifier 2014-05-24 22:31:42 +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
8e14946aad Ignore case for chat room mention notification 2014-05-24 16:59:45 +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
b85fd5e78c Use account muc_nick when no nick for bookmark 2014-05-23 00:55:30 +01:00
James Booth
ff37b44a62 Added common.h to parser.c 2014-05-22 20:07:43 +01:00
James Booth
40299882e8 Fixed define for g_hash_table_contains (glib < 2.32) 2014-05-22 20:03:47 +01:00
James Booth
6dbcc03543 Added g_hash_table_contains for glib < 2.32 2014-05-22 20:02:19 +01:00
James Booth
ce8f574444 Check for key on p_hash_table_add 2014-05-22 19:47:50 +01:00
James Booth
b1da6d1bc4 Added glib g_hash_table_add for glib < 2.32 2014-05-22 19:39:48 +01:00
James Booth
b3d49f2a3c Added backwards compatible g_list_free_full for glib < 2.28 2014-05-21 21:39:31 +01:00
James Booth
3c5a73d29e Use libgcrypt instead of libgnutls for SHA1 hashing 2014-05-21 20:35:01 +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
cara marie
058ce13aec spelling corrections 2014-05-17 18:19:30 -07:00
James Booth
10a8798973 Corrected bookmark help 2014-05-17 23:20:23 +01:00
James Booth
cb614ec36f Free autocomplete hash table 2014-05-17 22:49:24 +01:00
James Booth
e762d80b68 Use hash table for autocomplete functions 2014-05-14 21:54:38 +01:00
James Booth
75898a777a More tidy of bookmark autocomplete 2014-05-14 21:01:54 +01:00
James Booth
bd55e7a978 Tidied bookmark autocompleter 2014-05-14 20:53:31 +01:00
James Booth
506ce9cb13 Added autocomplete for bookmark autojoin 2014-05-14 20:49:25 +01:00
James Booth
e6e79d619a Free strings in cons_show_account 2014-05-12 23:32:36 +01:00
James Booth
fc3046782a Added OTR preferences to /account show commmand 2014-05-11 19:49:18 +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
2aa39fc362 Add contact to /otr policy autocomplete 2014-05-11 15:59:11 +01:00
James Booth
3967b26aea Added otr to /account clear properties 2014-05-11 15:32:38 +01:00
James Booth
d44e954f6b Added otr property to /account help 2014-05-11 15:26:45 +01:00
James Booth
6a38d57a0a Override global OTR policy with account OTR policy 2014-05-11 15:20:24 +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
ddbb4872b3 Moved global OTR settings to [otr] group 2014-05-11 13:13:25 +01:00
James Booth
7e359c171c Added autocomplete for bookmark options 2014-05-11 00:17:10 +01:00
James Booth
c0fc4256de Highlight active rooms in bookmark list 2014-05-10 01:05:03 +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
a519d25e4b Fixed potential segfaults on autocomplete 2014-05-08 20:49:41 +01:00
James Booth
dfb1e1c4a2 Added help for shared secret and question answer otr verification 2014-05-07 21:28:36 +01:00
James Booth
c6ba84096d Added question answer messages for libotr 4.0.0 2014-05-07 21:15:28 +01:00
James Booth
1e4fc2ce79 Added UI messages for smp question/answer result 2014-05-07 20:41:05 +01:00
James Booth
9fd9871ee9 Merge branch 'master' into otrsmp 2014-05-07 19:32:25 +01:00
James Booth
143c5a3493 Refactroed self presence checks, handle null stanzas
Issue #341
2014-05-06 22:07:44 +01:00
James Booth
ba8d1325ad Added null check for presence error stanza namespace element
Issue #341
2014-05-05 22:01:27 +01:00
James Booth
f247f367e9 Handle room subject and broadcasts sent before roster received
Issue #341
2014-05-05 20:13:22 +01:00
James Booth
aa0d4fe892 Merge branch 'master' into otrsmp
Conflicts:
	install-all.sh
2014-05-02 00:59:40 +01:00
James Booth
524b1f2383 Changed to use gnutls instead of openssl for sha1 hashing 2014-05-01 22:18:04 +01:00
James Booth
a077d2008a Added question answer authentication (libotr 3.2.x) 2014-04-30 23:59:40 +01:00
James Booth
eaa19598c1 Added ui functions for otr authentication 2014-04-30 22:41:53 +01:00
James Booth
8994b3769c Removed debug 2014-04-30 22:01:37 +01:00
James Booth
1155ceabbc Attempt at shared secret authentication for libotr 4.0.0
Bug exists where second attempt always gets stuck
2014-04-28 22:23:39 +01:00
James Booth
da4dfe251d Added SMP secret libotr 4.0.0 handlers 2014-04-27 18:46:40 +01:00
James Booth
183c373c66 Fixed error on SMP authentication fail 2014-04-27 02:04:05 +01:00
James Booth
2bc19f4669 Added SMP secret authentication success message 2014-04-27 01:17:38 +01:00
James Booth
c39c093fa5 Tidied UI messages for SMP shared secret authentication 2014-04-27 00:32:04 +01:00
James Booth
84c7fc9ae0 Added SMP ui events 2014-04-26 23:29:05 +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
ab4ea80a70 Added open xml console 2014-04-25 00:04:01 +01:00
James Booth
f8b2e009ed Fixed /wins swap help 2014-04-24 23:09:04 +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
034a98587c Added -a (--account) option to man page 2014-04-23 22:43:05 +01:00
James Booth
c7b3ff02ff Rejoin private rooms after reconnecting 2014-04-23 22:19:14 +01:00
James Booth
4384a1f468 Tidied jabber_process_events 2014-04-23 20:51:57 +01:00
James Booth
1706980fd7 Merge remote-tracking branch 'lucian/master'
Conflicts:
	src/server_events.c
2014-04-23 00:20:34 +01:00
James Booth
4d8caee483 Added /otr policy autocompletion 2014-04-23 00:01:18 +01:00
lightb
e08ee67f5f Bugfix: Because whitespace was removed, last check OTR always, didn't work, now it works. 2014-04-22 18:53:48 -04:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
lightb
5a5ad31edf Added new functionality to OTR always policy
If policy is set to always, and unencrypted message is received it will try to start an otr session.

Note: Fully tested with pidgin, is now working (opportunistic and always)
2014-04-22 18:07:53 -04:00
lightb
1192e67cf7 Strip whitespace from otr tagged message for proper display.
Will handle BASE + OTRV1TAG/OTRV2TAG or BASE + OTRV1TAG + OTRV2TAG
or BASE + OTRV2TAG + OTRV1TAG
2014-04-22 16:55:28 -04:00
lightb
1bd617d389 Small modification, should check for whitespace pattern even if policy is always. 2014-04-22 16:26:45 -04:00
lightb
6450e2a704 Added OTR opportunistic pattern intercept.
When a message is received, OTRL_MESSAGE_TAG_BASE + OTRL_MESSAGE_TAG_V1 or OTRL_MESSAGE_TAG_V2
is searched for, if it is, the client attempts to start an OTR session.

Tested between profanity clients: WORKED
Tested between profanity and pidgin: NOT WORKING (not sure if pidgin checks for the whitespace)
2014-04-22 16:01:57 -04:00
lightb
f95ae8b0dd Modified otrlibv4 and otrlibv4 to add informative message when starting OTR conversation. 2014-04-22 13:07:19 -04:00
lightb
36c6dbda86 Compilation v4 fix 2014-04-21 18:08:38 -04: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
James Booth
9a55d8ad19 Store password with room 2014-04-20 22:02:55 +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
lightb
3303376b42 Added PREF_OTR_POLICY - should be default global policy and set to MANUAL 2014-04-19 03:12:22 -04:00
James Booth
e830e2a06a Show message in console when contact starts OTR session 2014-04-19 00:56:57 +01:00
James Booth
71aea78e90 Open new window when otr session started by contact
fixes #331
2014-04-19 00:03:36 +01:00
James Booth
8f2c0a66bf Handle subscription on otr message sends 2014-04-18 23:40:35 +01:00
James Booth
fadad0aeba OTR end messages are now send to recipients not in the roster.
fixes #333
2014-04-18 23:29:22 +01:00
James Booth
df345a2cfb Merge remote-tracking branch 'pasis/iss323' 2014-04-18 21:41:05 +01:00
James Booth
d3a23d42e4 Fixed compile error when using libotr 4.0.0 2014-04-16 20:52:14 +01:00
James Booth
ef776e52ca Tidied xmlconsole 2014-04-15 23:45:17 +01:00
James Booth
e6e0a13e89 Added XML Console window 2014-04-15 13:16:32 +01:00
James Booth
bf185d9907 Added simple stanza logging to main console 2014-04-15 01:08:41 +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
2419737006 Check for duplicate options in option parser 2014-04-14 23:01:57 +01:00
James Booth
8d77930ece Added parse_options 2014-04-14 22:48:18 +01:00
James Booth
cc68fc5e9a Show console message on room autojoin 2014-04-14 20:32:51 +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
bc6f8ceb3a Fixed handling of room subject 2014-04-13 03:11:46 +01:00
James Booth
99592e2779 Show message when no bookmarks found
Issue #194
2014-04-13 02:57: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
f332b6681e Fixed "/bookmark remove" for disabling autojoin
Issue #194
2014-04-13 02:27:37 +01:00
James Booth
f62cf772a7 Refactored bookmark_remove
Issue #194
2014-04-13 02:05:12 +01:00
James Booth
73c146c65a Implemented "/bookmark remove" for private storage
Issue #194
2014-04-13 01:39:54 +01:00
James Booth
0b2f810431 Added bookmark autocomplete to /join
Issue #194
2014-04-13 01:20:36 +01:00
James Booth
f7daaf0953 Clean up after removing bookmark
Issue #194
2014-04-13 01:11:21 +01:00
James Booth
5bb3fab17c Implemented "/bookmark add" for private storage
Issue #194
2014-04-13 01:01:53 +01:00
James Booth
132976d85e Revert "Added ui_unknown_command"
This reverts commit 714ee24863.
2014-04-12 15:20:31 +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
714ee24863 Added ui_unknown_command 2014-04-09 22:13:01 +01:00
James Booth
b9aac28ccc Refactored invalid command usage 2014-04-09 22:05:31 +01:00
James Booth
26216f6c17 Refactored cmd_execute 2014-04-09 21:38:57 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
Dmitry Podgorny
aa6e2284fc config/theme: search for system-wide themes
Search for system-wide themes (usually /usr/share/profanity/themes) if
not found in user's home directory.

Not tested yet.
2014-04-09 21:42:14 +03:00