aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code
2,927 Commits 31 Branches 59 Tags 24 MiB
c2dccad818
Commit Graph

2068 Commits

Author SHA1 Message Date
James Booth
3417f25dd1 Use stanza_get_error_message for pong errors 2014-09-09 22:26:14 +01:00
James Booth
c636134566 Merge branch 'master' into roomconfig 2014-09-09 21:29:18 +01:00
James Booth
273cddd661 Merge remote-tracking branch 'pasis/memleak' 2014-09-09 20:57:28 +01:00
Dmitry Podgorny
b6faeaaa76 Fixed memory leaks 2014-09-09 22:07:28 +03:00
James Booth
6166d456e8 Added TODO for handling room config form request errors 2014-09-09 00:16:29 +01:00
James Booth
2ad4c7b4e0 Formatting of room config form 2014-09-09 00:14:40 +01:00
James Booth
73ae2e54c5 Move to existing room config window if exists 2014-09-08 22:33:48 +01:00
James Booth
aeca03d348 Merge branch 'master' into roomconfig 2014-09-07 22:36:05 +01:00
James Booth
b69c9aad87 Fixed spelling mistake in ping errors 2014-09-07 22:34:54 +01:00
James Booth
14ede0e44c Merge branch 'master' into roomconfig 
Conflicts:
	src/server_events.h
 2014-09-07 21:54:04 +01:00
James Booth
8f08c7a21e Added error handling for /ping command responses 2014-09-07 21:50:59 +01:00
James Booth
ee6208866a Removed unnecessary NULL checks when freeing form 2014-09-07 14:13:44 +01:00
James Booth
85ccedd01c Create new window for room configuration 2014-09-07 00:49:42 +01:00
James Booth
47d1b1ea21 Moved room config UI code to ui/core.c 2014-09-07 00:22:11 +01:00
James Booth
055ba3c4b2 Fix option handling for room config form parsing 2014-09-06 23:34:49 +01:00
James Booth
a4f6e9391c Reassign stanza name when looking for field values 2014-09-06 23:23:23 +01:00
James Booth
05bff31bb3 Added further debug output for room config 2014-09-06 23:07:07 +01:00
James Booth
2599c43d66 Rewrite form parser 2014-09-06 22:40:57 +01:00
James Booth
157a1b5ff7 Created form module 2014-09-05 21:04:16 +01:00
James Booth
fa28741b74 Merge branch 'master' into roomconfig 2014-09-05 20:36:59 +01:00
Michael Phillips
7023516a8e Changed summary for /help autoaway to reflect correct parameter 'time' 2014-09-05 11:39:08 -05:00
James Booth
9728d1a727 Debug room config form fields 2014-09-05 13:48:53 +01:00
James Booth
c133b89313 Debug room vars 2014-09-05 13:30:30 +01:00
James Booth
5e1023dfd9 Parse data form for room configuration 2014-09-04 23:15:51 +01:00
James Booth
763356464a Added ID handler for room config form 2014-09-04 22:41:10 +01:00
James Booth
1e0e5597c2 Added /room config edit and /room config cancel 2014-09-04 22:29:57 +01:00
James Booth
bf283652f8 Fix room config check for servers that don't send 110 status 2014-09-04 20:17:39 +01:00
James Booth
e55b9dbeff Fixed spelling mistake 2014-09-04 13:31:28 +01:00
James Booth
dffe90f67d Updated help for /ping 2014-09-04 01:09: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
64521eb135 Handle /room config cancel 2014-09-03 22:00:08 +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
57effcd504 Show message when room requires config 2014-09-03 00:23:04 +01:00
James Booth
1a6dc76360 Added back switching win on new outgoing message 2014-09-01 21:30:31 +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
c73c4b20ef Tidied console presence messages 2014-09-01 00:05:12 +01:00
James Booth
8cf5241d31 Paging fixes 
- Include empty line when showing end page
- Switch off paging when last line and empty line visible
 2014-08-31 23:46:13 +01:00
James Booth
15fe590eda Removed bookmarks todo 2014-08-31 23:11:30 +01:00
James Booth
62be586c39 Merge remote-tracking branch 'tdi/master' 2014-08-29 00:01:55 +01:00
Dariusz Dwornikowski
b641680251 Concise formatting of /roster command 2014-08-28 19:17:15 +02:00
Dariusz Dwornikowski
1dcc028a71 Small spelling fixes in code and comments 2014-08-27 13:26:11 +02:00
James Booth
f9737251a6 Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
James Booth
0b47bba6cc Check window exsists before doing incoming typing notifications 
issue #397
 2014-08-21 22:35:14 +01:00
James Booth
9fd45059eb Check for chat room window on muc events, log error when doesn't exist 
issue #341
 2014-08-20 21:30:44 +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
James Booth
5b40696ea0 Handle chat states for users not in roster 
issue #397
 2014-08-19 21:22:43 +01:00
James Booth
30574e5334 Set window active instead of new on room subject 2014-08-18 23:00:24 +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
Dariusz Dwornikowski
225312802e Spelling errors fixed and hyphenation used as minus sign fixed 2014-08-11 18:54:20 +02:00
James Booth
651d5aaaf0 Fix notification support check for cygwin 2014-08-10 01:20:42 +01:00
James Booth
8fc4249228 Enable splash logo by default 2014-08-09 19:00:59 +01:00
James Booth
ac68cc77f8 Allow escaping commands using double slash "//" 2014-08-06 22:46:36 +01:00
James Booth
e38ebe8a85 Check for unknown commands and show message in console 
fixes #390
 2014-08-04 22:21:53 +01:00
James Booth
cd9b1449b5 Escape open bracket at start of OSX notification messages 
fixes #391
 2014-08-04 22:01:03 +01:00
James Booth
f18bfc3396 Escape backtick in mac terminal notifications 2014-08-04 21:41:17 +01:00
James Booth
d8cab42a2a Merge branch 'master' into winbuffers 2014-07-29 15:52:14 +01:00
James Booth
816351d371 Set auto reconnect to 30 seconds by default 
fixes #386
 2014-07-29 15:40:51 +01:00
James Booth
73a56de470 Changed comma colour in room roster 2014-07-23 01:06:57 +01:00
James Booth
3eaebeb002 Merge branch 'master' into winbuffers 2014-07-22 23:37:21 +01: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
79c857fb2a Fixed bug with chat room history times being coloured 2014-07-22 22:16:17 +01:00
James Booth
56457de997 Fixed colouring in room roster 2014-07-21 13:32:46 +01:00
James Booth
1273d850a4 Use win_save_println in core.c 2014-07-21 00:18:37 +01:00
James Booth
db9028d9c3 Added win_save_println 2014-07-21 00:11:38 +01:00
James Booth
f4fa0bc2dd Added win_save_newline 2014-07-20 23:57:31 +01:00
James Booth
490e252fb4 Removed win_print from window.h 2014-07-20 23:39:17 +01:00
James Booth
bb0fe16b4d Made win_print static 2014-07-20 23:35:48 +01:00
James Booth
5ce08adff6 Added BUFF_SIZE back again 2014-07-20 21:53:50 +01:00
James Booth
b125fa0feb Return address of buffer entry 2014-07-19 17:14:04 +01:00
James Booth
191b910d6e Erase stdscr before resizing 2014-07-19 00:39:49 +01:00
James Booth
bf62d8bd65 Use PAD_SIZE for buffer max size 2014-07-18 23:52:00 +01:00
James Booth
78b0388b6c Merge branch 'statusbar' into winbuffers 2014-07-18 23:19:25 +01:00
James Booth
60afe66042 Moved status_bar_resize 2014-07-18 23:17:42 +01:00
James Booth
1e6b70943a Use GSList for buffer entries 2014-07-18 23:07:08 +01:00
James Booth
2a435cd3de Removed horizontal paging 2014-07-18 22:28:49 +01:00
James Booth
d2d15ca76b Removed newlines from splash logo version output 2014-07-16 23:23:11 +01:00
James Booth
a4edc12d80 Removed flag != 0's 2014-07-16 22:56:58 +01:00
James Booth
20c11adddc Used constants for print flags 2014-07-16 22:41:02 +01:00
James Booth
860591872f Removed unused function 2014-07-16 22:34:02 +01:00
James Booth
0619303abe Whitespace formatting 2014-07-16 22:31:25 +01:00
James Booth
2786b7cb26 Whitespace formatting 2014-07-16 22:22:15 +01:00
James Booth
a607b29d4a Replaced NO_EOL_DATE with bitwise or 2014-07-16 22:20:23 +01:00
James Booth
ddb6eee18d Use constants for flags 2014-07-16 22:12:20 +01:00
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
James Booth
6275644de4 Fixed spelling in comment 2014-04-07 22:43:02 +01:00
James Booth
a05b63f7a5 Removed unused inputwin module init 2014-04-07 22:01:50 +01:00
James Booth
9aa282f6de Removed inputwin functions from ui.h 2014-04-07 21:50:28 +01:00
James Booth
e2443511b6 Tidied new headers, added defines 2014-04-07 21:19:35 +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
c7e214860c Removed create_title_bar from ui.h 2014-04-07 20:00:11 +01:00
James Booth
aa2a87d162 Tidied ui dependencies 2014-04-06 21:35:17 +01:00
James Booth
ccfea12674 Inlined wins_update_virtual_console and wins_update_virtual_current 2014-04-06 21:06:50 +01:00
James Booth
6b2d2fd8e4 Removed dirty flag from statusbar 2014-04-06 01:33:00 +01:00
James Booth
c9d28b6999 Inlined status_bar_update_time 2014-04-06 01:14:21 +01:00
James Booth
4248b61a0c Renamed function to draw terminal title 2014-04-06 00:47:14 +01:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00
James Booth
95c081666a Clear window title bar on exit 2014-04-03 21:13:59 +01:00
James Booth
e083e20313 Added check on input length 2014-04-02 22:19:27 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
e1db531875 Show recipient not found in console only when no window for recipient 2014-04-02 20:02:46 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
e8e5ab597a Do not scroll to end when chat room message whilst paging 2014-03-31 21:50:33 +01:00
James Booth
3fdd9944ab Do not scroll to end in message window when paging 2014-03-31 21:44:34 +01:00
James Booth
3d768527c1 Moved ui_current_page_off to ui_incoming_msg 2014-03-31 21:09:24 +01:00
James Booth
b303bdd057 Hooks test commit 2014-03-30 00:35:56 +00:00
James Booth
8f7bdc3c2e Switch back to storage for muc bookmarks 2014-03-29 23:15:51 +00:00
James Booth
7e27d96f16 Revert "Commented bookmarks code for 0.4.0 release" 
This reverts commit 8306d4c244.
 2014-03-29 22:58:48 +00:00
James Booth
9815ef3b02 Change libotr 4.0.0 code to use only OTR spec v2 2014-03-24 21:02:10 +00:00
James Booth
8306d4c244 Commented bookmarks code for 0.4.0 release 2014-03-16 18:20:31 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
b177250f47 Refactored muc_room_is_active to only take room, rather than full jid 2014-03-08 21:20:26 +00:00
James Booth
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
James Booth
e9b5d3294b Removed unused variables from cmd_join 2014-03-08 18:32:48 +00:00
James Booth
a94814f0a9 Added invalid jid test for /join 2014-03-08 00:23:52 +00:00
James Booth
2d54c565ce Added test to show usage when no room supplied to /join 2014-03-08 00:19:21 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +00:00
Dmitry Podgorny
0fbaa6f5ee fixed build error when make run with -jN option 
Race can occur when gitversion file isn't fully generated before
it is used.
 2014-03-06 02:06:22 +02:00
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
James Booth
65432c8d64 Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs' 2014-03-05 20:29:41 +00:00
Kristofer M White
7c6755b62c Ensuring nick is set when not included in opt args for cmd_join 2014-03-05 19:55:02 +00:00
Kristofer M White
3f18d933ca Removing extra nick = line that broke nick assignment 2014-03-05 17:39:44 +00:00
Kristofer M White
a4e2809756 Removing strdup calls per cmd_connect design 2014-03-05 17:25:26 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
3f73a55cb0 Log message when cannot send desktop nofication 2014-03-04 20:16:47 +00:00
James Booth
8cfbb72337 Added OSX desktop notifications using terminal-notifier 
Requires Xcode
WIP - No configure.ac changes
 2014-03-04 20:01:19 +00:00
Kristofer M White
ced6e7f411 Making whitespace consistently spaces, not tabs 2014-02-27 05:40:31 +00:00
Kristofer M White
8a54c5895d Adding password handling for joining chatrooms 2014-02-27 05:31:10 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
James Booth
18e0884f5f Fixed issue with /otr myfp when no key loaded 2014-02-23 20:34:27 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session 
fixes #308
 2014-02-23 01:17:03 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
a21ab6d4c8 Mock otr module for cmd_otr tests 2014-02-16 19:14:15 +00:00
James Booth
7e956fb347 Added tests for /otr warn 2014-02-16 02:22:29 +00:00
James Booth
6295336284 Added cmd_otr tests 2014-02-16 00:04:53 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
bdfcc81b07 Only show error message when err != 0 
fixes #307
 2014-02-15 19:47:36 +00:00
James Booth
9ff7a2a1fe Removed free message function from otrlibv3 2014-02-13 23:09:52 +00:00
James Booth
450c01ecb4 Refactored common otr library code 2014-02-13 23:07:09 +00:00
James Booth
4e81707b27 Renamed otr implementations 2014-02-12 23:29:08 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
25131e3f36 Added command to show libotr version 2014-02-11 23:19:09 +00:00
James Booth
42630139c2 Use instag master, and skip fragmentation 2014-02-11 23:03:07 +00:00
James Booth
e07209ec49 Allow V3, use OTRL_INSTAG_BEST, output error event when no message 2014-02-11 21:21:33 +00:00
James Booth
5b260af999 Changed OTR policy for otr4.c 2014-02-10 23:24:07 +00:00
James Booth
88e8c0151d Merge branch 'libotr4' of github.com:boothj5/profanity into libotr4 2014-02-10 23:23:11 +00:00
James Booth
291c977473 Changed OTR policy allow V1 and V2 2014-02-10 23:20:06 +00:00
James Booth
d5ba4dfd38 Changed functions for libotr4 compatibility 2014-02-09 02:53:07 +00:00
James Booth
26e1fd545c Added libotr4 message handlers 2014-02-09 02:24:47 +00:00
James Booth
4bd5cf35ff Added otr4.c 2014-02-09 00:34:00 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
3e02921859 Removed id from bookmarks add 2014-02-03 19:35:26 +00:00
James Booth
0f0cd4cdab Use wnoutrefresh, pnoutrefresh and doupdate 
Issue #298
 2014-02-02 23:58:01 +00:00
James Booth
9394091f04 Implemented add bookmark for XEP-0223 
Issue #194
 2014-02-02 02:39:36 +00:00
James Booth
95c48a0f47 Test message when removing autojoin for non existent bookmark 2014-02-02 01:05:52 +00:00
James Booth
9d957e5f93 Show message on /bookmark remove when bookmark does not exist 2014-02-02 00:59:32 +00:00
James Booth
92b85bb7f1 Added message when bookmark updated 2014-02-02 00:49:02 +00:00
James Booth
a8ecbccc9c Added /bookmark remove tests 2014-02-02 00:37:37 +00:00
James Booth
ebafc19220 Added cons message on ./bookmark add 2014-02-02 00:00:08 +00:00
James Booth
af51fa3c68 Added cmd_bookmark tests 2014-02-01 23:48:24 +00:00
James Booth
3d7d070b13 Added test for /bookmark list 2014-02-01 21:18:15 +00:00
James Booth
614ae232ef Fixed cmd_bookmark message when not connected 2014-02-01 16:24:51 +00:00
James Booth
652e99fdd8 Added cmd_bookmark tests 2014-02-01 16:16:56 +00:00
James Booth
0338d136e0 Added presence_error tests, added muc_close() 2014-01-30 23:15:39 +00:00
James Booth
12666b41e6 Refactored handle_presence_error, removed no longer used functions 2014-01-30 22:20:57 +00:00
James Booth
2cd24a484a Renamed handle_error_message -> handle_presence_error 2014-01-30 21:43:31 +00:00
James Booth
9bb1fae291 Close UI windows on /quit 
fixes #296
 2014-01-30 20:30:35 +00:00
James Booth
5afb296e67 Moved error handling logic to server_events 2014-01-28 22:37:50 +00:00
James Booth
c3ea8f8d0b Added generated id's to presence stanzas 2014-01-28 20:55:02 +00:00
James Booth
8f6ead2b7b Changed log level to info for failed connection 2014-01-27 22:50:32 +00:00
James Booth
6dbea7e16f Add level to log output 2014-01-27 22:48:52 +00:00
James Booth
e9959d5d38 Refactored presence_error_handler 2014-01-27 22:35:04 +00:00
James Booth
27293ebbc2 Added fallback message error handlers 2014-01-27 22:09:16 +00:00
James Booth
678a5bd05c Fixed comment 2014-01-27 21:48:44 +00:00
James Booth
da94dcf3cf Moved connection_error_handler to _presence_error_handler 2014-01-27 21:42:34 +00:00
James Booth
f26686aeca Removed unnecessary strdup 2014-01-27 21:33:02 +00:00
James Booth
1a300ce7d3 Show original error message 2014-01-26 22:50:22 +00:00
James Booth
50f1a5ecc0 Changed error message when couldn't join room 2014-01-26 22:19:22 +00:00
James Booth
292ae567aa Handle recipient not found 2014-01-26 18:30:34 +00:00
James Booth
46b3ff6f44 Added generated id to chat state stanzas 2014-01-26 14:15:04 +00:00
James Booth
7184c34d30 Added generated id to invites 2014-01-26 14:10:45 +00:00
James Booth
ae1ccc7bae Add generated id to messages 2014-01-26 01:07:11 +00:00
James Booth
16de267906 Added id handler for pings, disable ping on error type 'cancel' 2014-01-26 00:53:24 +00:00