aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
6,586 Commits 32 Branches 59 Tags 24 MiB
7486e22b77
Commit Graph

1651 Commits

Author SHA1 Message Date
James Booth
6cc4abedc5 Move window functions to window_list.c 2016-07-24 17:02:09 +01:00
James Booth
ef942bd27a Add config/files.c 2016-07-24 16:22:15 +01:00
James Booth
0a57c4de78 Tidy headers 2016-07-24 15:43:51 +01:00
James Booth
5bc38b6bc2 Moved window_list.c 2016-07-24 15:14:46 +01:00
James Booth
8f213f22e7 Moved tray.c 2016-07-24 15:10:58 +01:00
James Booth
90b9b48ab9 Moved roster_list.c 2016-07-24 15:08:47 +01:00
James Booth
2af0d38e3d Moved muc.c 2016-07-24 15:02:43 +01:00
James Booth
1c5efaeb58 Moved jid.c 2016-07-24 14:59:28 +01:00
James Booth
c23506f453 Moved contact.c 2016-07-24 14:55:32 +01:00
James Booth
310abd401d Moved chat_state.c 2016-07-24 14:28:25 +01:00
James Booth
25a6252a28 Moved chat_session.c 2016-07-24 14:23:55 +01:00
James Booth
8d8f2f290d Moved chat state handling code to chat_state.c 2016-07-24 13:56:11 +01:00
James Booth
e8fc80f5c1 Update GPL link in headers 2016-07-24 01:14:49 +01:00
Pete Maynard
14c8f53f85 Updated GPL URL 2016-07-21 11:49:52 +01:00
James Booth
7abf506261 Free memory when plugin windows closed 2016-07-13 00:25:45 +01:00
James Booth
5f393a6d9f Remove plugin window on /close 2016-07-12 02:16:12 +01:00
James Booth
71879a3f64 Free plugins commands on quit 2016-07-04 00:41:29 +01:00
James Booth
29eb843d56 Revert "WIP - Unload plugin commands" 
This reverts commit a01eb5d08e.
 2016-06-30 22:37:52 +01:00
James Booth
a01eb5d08e WIP - Unload plugin commands 2016-06-29 23:35:57 +01:00
James Booth
383e601f25 Move /statuses options to /presence command 2016-05-31 23:21:19 +01:00
James Booth
94212cd01c Update window navigation help 2016-05-25 00:21:27 +01:00
James Booth
6559263b2f Option to bookmark room invites 
issue #813
 2016-05-23 23:53:44 +01:00
James Booth
0edd430925 Merge branch 'cmd-tidy' 2016-05-23 22:34:45 +01:00
James Booth
3aa788772e Updated console output for room invites 2016-05-23 22:27:29 +01:00
James Booth
fb34785566 Rename command sources 2016-05-22 23:59:52 +01:00
James Booth
eaf2901b01 Add cmd_autocomplete.c 2016-05-20 00:19:03 +01:00
James Booth
a04e34fddc Fix output for tray timer setting 2016-05-15 02:15:45 +01:00
James Booth
c6a6e3a51c Add /tray timer <seconds> 
closes #787
 2016-05-15 01:41:34 +01:00
James Booth
d00615beba Add /tray read on|off command 
issue #786
 2016-05-15 00:55:19 +01:00
James Booth
cf8452d95f Reorder headers in inputwin.c 
Fixes unknown type name '_fpos64_t' error on Cygwin
 2016-05-11 22:50:19 +01:00
James Booth
d805d0c886 Added missing header in ui.h 2016-05-11 22:22:59 +01:00
James Booth
9596591610 Move available resources to connection struct 2016-05-07 23:04:50 +01:00
James Booth
81e95966cf Remove redundant tls secured function 2016-05-06 02:18:31 +01:00
James Booth
d1c71e98f4 Move connection fulljid function 2016-05-06 01:12:54 +01:00
James Booth
88f423afea Rename jabber_ functions 2016-05-06 00:53:03 +01:00
James Booth
3bb1f12410 Add session.c 2016-05-05 23:51:49 +01:00
James Booth
ccabc08fef Tidy xmpp headers 2016-05-04 01:19:51 +01:00
Dmitry Podgorny
efbf233c85 Define stanza's attributes as const char* 
In most get-like funcitons libstrophe returns pointer to a string
that resides in an internal structure (e.g. xmpp_stanza_t). Hence,
Profanity must not change such strings. Define respective variables
as 'const char*' to reduce a chance of error and conform future
libstrophe's interface.

This patch mostly replaces 'char *' with 'const char*', but also
fixes two memory leaks after stanza_get_reason(). Add comment within
stanza_get_reason() to fix conflict with different allocator types.
 2016-04-27 10:31:28 +00:00
James Booth
4ca6296fb7 Fix OSX compile 2016-04-26 23:50:56 +02:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02:00
James Booth
2daa02cb60 Merge remote-tracking branch 'asdil12/tray_config' 2016-04-17 23:17:43 +01:00
Dominik Heidler
4cb1d73a83 Make tray icon configurable using /tray cmd 2016-04-16 16:29:32 +02:00
James Booth
93672eba9f Plugins: Added on_room_history_message 2016-04-08 00:11:33 +01:00
James Booth
f243e333fc Added whole word matches for room mention 2016-04-07 01:01:27 +01:00
James Booth
6f81f2b845 Removed newline handling code from rosterwin.c 2016-03-31 23:14:51 +01:00
James Booth
9b177a9e01 Removed #AX_PREFIX_CONFIG_H 2016-03-31 21:05:02 +01:00
James Booth
6f537c3818 Add PGP decryption for incoming/outgoing carbons 2016-03-22 00:20:29 +00:00
James Booth
185405b9d1 Fixed PLATFORM_CYGWIN references 2016-03-10 22:21:56 +00:00
James Booth
355adb117c Added WIN_PLUGIN case to win_free() 2016-03-07 18:24:04 +00:00
James Booth
7fdf50eb31 Add plugin wins to /win and /close autocompletion 2016-03-01 00:03:11 +00:00
James Booth
accde2a61c Fixed cygwin compile 2016-02-28 19:05:26 +00:00
James Booth
9d31ce49c3 Added missing stdlib.h include 2016-02-24 00:59:28 +00:00
James Booth
412dc13629 Added prof_cons_bad_cmd_usage plugin function 2016-02-18 22:25:43 +00:00
James Booth
0ed3b53bd2 Integrated plugins with /help command 2016-02-18 21:53:20 +00:00
James Booth
639623d625 Tidied cons_show_help 2016-02-18 20:52:52 +00:00
James Booth
a14b7815ae Added new help format to c plugins WIP 2016-02-18 01:20:37 +00:00
James Booth
1f90aca503 Merge branch 'master' into plugins-c 
Conflicts:
	src/main.c
	src/ui/console.c
 2016-02-14 23:00:52 +00:00
James Booth
e53e94f1e2 Updated copyright 2016-02-14 22:54:46 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
f887a35c0c Fixed memory deallocations 2016-02-14 01:59:53 +00:00
James Booth
c3dfd6d35a Highlight longer triggers first 2016-02-13 22:55:57 +00:00
James Booth
1a3dc91e11 Highlight room trigger terms 2016-02-13 22:46:25 +00:00
James Booth
2f82f50a35 Added roommention.term theme option 2016-02-10 23:03:23 +00:00
James Booth
71679a3159 Added mention and trigger themes for console 2016-02-10 21:38:28 +00:00
James Booth
62b0cdd8fd Fix room notification reminders 2016-02-07 01:15:40 +00:00
James Booth
abc2f0de39 Added /roster show|hide unsubscribed 2016-02-07 00:49:48 +00:00
James Booth
6702bb9739 Don't show notification reminders for messages the user does not want notifications for 2016-02-04 01:24:37 +00:00
James Booth
e1962261a9 Tidy notify_room_message() 2016-02-04 00:45:37 +00:00
James Booth
c14ef33906 Tidy notify_message() 2016-02-04 00:41:53 +00:00
James Booth
8342265607 Removed unused arg: prefs_do_chat_notify() 2016-02-04 00:21:38 +00:00
James Booth
bab75cae15 Implemented /console private setting 2016-02-03 23:39:20 +00:00
James Booth
19a3066e28 Implemented /console chat setting 2016-02-03 23:16:42 +00:00
James Booth
77e819e81a Handle self leaving room in private wins 2016-02-03 00:11:38 +00:00
James Booth
3ddef99dfe Handle occupant kicked/banned in private chat wins 2016-02-02 22:25:55 +00:00
James Booth
150015fa3d Show message in private windows when user offline 2016-02-02 21:52:13 +00:00
James Booth
f91b21a1d6 Allow splitting roster rooms by conference server 2016-02-01 01:11:01 +00:00
James Booth
08c1e62e3c Colour private chats by presence in roster panel 2016-01-31 23:08:14 +00:00
James Booth
431913127c Roster panel colour fixes 2016-01-31 22:02:04 +00:00
James Booth
3805fcfbd1 Fixed /pref ui formatting 2016-01-31 20:26:49 +00:00
James Booth
a00095c8a9 Added roster.rooms.private.char setting 2016-01-31 20:17:20 +00:00
James Booth
dd250c6799 Show orphaned private chats 2016-01-31 19:38:06 +00:00
James Booth
a0f43adf5b Only add private chats to Rooms unread count in roster when room active 2016-01-31 18:52:53 +00:00
James Booth
1c65c36cb6 Show offline contacts with unread messages in roster 2016-01-31 02:47:50 +00:00
James Booth
e816b124ee Removed unused arg from roster_get_ functions 2016-01-31 02:33:44 +00:00
James Booth
369aa5e8a8 Added filter functions to roster 2016-01-31 02:27:02 +00:00
James Booth
f17ecb77d2 Added functions for rooms and private chat headers 2016-01-31 00:34:44 +00:00
James Booth
5bbb3ef413 Added _rosterwin_contacts_header function 2016-01-30 23:53:46 +00:00
James Booth
3f3182a7de Reorganise rosterwin.c 2016-01-30 23:11:31 +00:00
James Booth
20659b9841 Added _rosterwin_contacts_all function 2016-01-30 22:54:52 +00:00
James Booth
2092273474 Removed _rosterwin_contacts_by_no_group function 2016-01-30 22:39:08 +00:00
James Booth
7c4a63f3c2 Moved offline check logic in roster panel 2016-01-30 22:23:59 +00:00
James Booth
b801a605a7 Show private chat unread message count in roster panel 2016-01-28 01:08:16 +00:00
James Booth
27adf0311b Updated themes 2016-01-28 00:43:50 +00:00
James Booth
fbe8c1e345 Added unread counts to roster 2016-01-28 00:26:20 +00:00
James Booth
d4f1384b85 Store /roster count setting 2016-01-27 23:02:28 +00:00
James Booth
0501e49623 Fix handling of unknown characters with word wrap 2016-01-26 00:25:13 +00:00
James Booth
38dfdb9d84 Added missing header 2016-01-25 22:54:34 +00:00
James Booth
0ae975c27f Added themes for roster room mention and triggers 
closes #718
 2016-01-25 00:19:26 +00:00
James Booth
b6e9a09c64 Show console messages for room mention and triggers 
closes #719
 2016-01-24 23:47:17 +00:00
James Booth
5ff9fbd810 Tidy handling room mention and room triggers 2016-01-24 23:06:22 +00:00
James Booth
5ff36c14c0 Added roomtrigger colour theme 
closes #717
 2016-01-24 17:33:26 +00:00
James Booth
2a8da892aa Roster private chat preferences 2016-01-24 02:28:22 +00:00
James Booth
7cacee8781 Added private chat roster group 2016-01-24 01:30:02 +00:00
James Booth
6d8a3e2020 Added /roster private command 2016-01-24 01:04:21 +00:00
James Booth
67abfaa21e Added private chat to roster rooms 2016-01-24 00:33:24 +00:00
James Booth
2df622f9fd Formatting of /theme properties command output 2016-01-23 22:55:04 +00:00
James Booth
6ec3f71a54 Pad theme settings 2016-01-23 21:47:23 +00:00
James Booth
53fc89f711 Added account theme property 2016-01-22 01:06:28 +00:00
James Booth
37171fe692 Show theme colour value 2016-01-21 02:00:12 +00:00
James Booth
6b65a9be15 Tidied theme properties 2016-01-21 01:30:18 +00:00
James Booth
adb470c454 WIP: Add /theme properties command 2016-01-21 00:50:55 +00:00
James Booth
5bccee93cc Added /roster show|hide contacts 2016-01-20 01:48:41 +00:00
James Booth
10507b687b Added sys/select.h header includes 2016-01-19 22:55:43 +00:00
James Booth
519b10d105 Added /roster rooms position preference 2016-01-19 22:38:00 +00:00
James Booth
cce01f1d75 Added /roster unread preferrence 
closes #712
 2016-01-17 02:17:12 +00:00
James Booth
e58be44f81 Added /roster room unread preference 
closes ##708
 2016-01-17 01:49:16 +00:00
James Booth
aab6a52eee Show unread message count for contacts in roster 2016-01-15 00:44:47 +00:00
James Booth
fbc302317a Added roster contact themes 2016-01-14 22:54:50 +00:00
James Booth
850ac3c6c0 Allow unlimited theme items 2016-01-10 03:11:05 +00:00
James Booth
de90243401 Added roster rooms order preference 2016-01-09 22:21:09 +00:00
James Booth
cd2458c019 Added roster room themes 2016-01-09 21:37:59 +00:00
James Booth
fcbd2592cf Use different colour for roster chat rooms with unread messages 2016-01-09 20:40:13 +00:00
James Booth
055a5f71ce Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
James Booth
4f35b11471 End OTR session when recipient goes offline 2016-01-03 01:32:37 +00:00
James Booth
523c35c375 Fix roster rooms checks 2016-01-02 02:50:17 +00:00
James Booth
8ca3fe4ea8 Sort roster rooms 2016-01-02 02:41:51 +00:00
James Booth
f9d89d564f Check for mucwin before showing room in roster 2016-01-02 01:45:02 +00:00
James Booth
254c83d2d1 Added /roster show|hide rooms 2016-01-02 01:37:03 +00:00
James Booth
cf80fdc329 Added roster rooms preference 2016-01-02 01:29:12 +00:00
James Booth
22a14e1240 Show rooms in roster panel 2016-01-02 01:22:19 +00:00
James Booth
f27cae68c5 Added autoping timeout preference 2016-01-01 19:50:13 +00:00
James Booth
6a8656a06b Added /console command 2015-12-29 23:32:32 +00:00
James Booth
8ea228480c Added console MUC message preference 2015-12-29 23:00:49 +00:00
James Booth
d9f5a2bda6 Updated console new message text 2015-12-20 23:26:05 +00:00
James Booth
1b88b5706e Change console incoming message text to include "win" 2015-12-20 22:50:03 +00:00
James Booth
1f56c12377 Added cons_show_incoming_room_message() 2015-12-20 00:54:17 +00:00
James Booth
a02c89a8e8 Use MB_CUR_MAX when calculating cursor position 2015-12-19 23:21:07 +00:00
James Booth
53fd2b3534 Read ~/.config/profanity/inputrc 2015-12-06 02:12:20 +00:00
James Booth
e9e54dca44 Renamed readline handlers 2015-12-06 01:33:53 +00:00
James Booth
0d25de9459 Added readline function definitions 2015-12-06 01:33:36 +00:00
James Booth
1e6a1f9921 readline: set rl_outstream to /dev/null 2015-12-01 22:24:43 +00:00
James Booth
d35f30f382 Merge remote-tracking branch 'kiethandi/master' 2015-11-30 23:58:29 +00:00
U-DIR\kieran.thandi
d288291e49 Include string take 2 2015-11-30 23:16:33 +00:00
U-DIR\kieran.thandi
a78dba0ced resolve strdup dec 2015-11-30 22:57:10 +00:00
U-DIR\kieran.thandi
b818dddb32 Inclued stdlib 2015-11-30 22:34:24 +00:00
James Booth
0920b65ddf Added /wins unread 2015-11-30 00:17:44 +00:00
James Booth
d9435d3b65 Tidy wins_create_summary() 2015-11-29 23:58:52 +00:00
James Booth
6e304bb867 Disable readline completion 2015-11-29 22:23:31 +00:00
James Booth
921ce6ec7d Changed /bookmark list output to show text "win" 2015-11-29 01:13:00 +00:00
James Booth
3fbee4023e Renamed /notify message -> /notify chat 2015-11-29 00:08:49 +00:00
James Booth
2fc984e673 Removed regular chat message triggers 2015-11-28 23:43:02 +00:00
James Booth
60305de0d9 Added room specific notify settings 2015-11-28 00:15:53 +00:00
James Booth
d3389db233 Only show reminder notifications when notifications are enabled 2015-11-25 22:33:26 +00:00
James Booth
20e63e364b Finished basic /notify triggers 2015-11-25 21:24:21 +00:00
James Booth
b9794361f7 Implemented regular chat notify triggers 2015-11-25 01:42:27 +00:00
James Booth
9c8b137a51 Tidy regular chat and room notifications 2015-11-24 23:03:52 +00:00
James Booth
b79d77409f Added notify triggers WIP 2015-11-23 23:43:53 +00:00
James Booth
bf1e7efe23 Show summary of trusted certificates, add /tls cert <fingerprint> 
fixes #676
 2015-11-22 19:53:41 +00:00
James Booth
216493ef07 Tidied roster commands 2015-11-22 17:45:38 +00:00
James Booth
0f22179eef Added /roster resource join 2015-11-22 16:37:05 +00:00
James Booth
c4e8af0b6d Added /roster char resource 2015-11-22 02:04:59 +00:00
James Booth
3bc9275079 Added word wrap to roster panel 2015-11-22 01:39:20 +00:00
James Booth
0763bfc9f4 Pass wrap boolean to win_sub_print() 2015-11-22 01:00:14 +00:00
James Booth
3d1299eb1e Renamed subwin functions 2015-11-22 00:54:40 +00:00
James Booth
b4482b9fe1 Updated themes 2015-11-22 00:48:18 +00:00
James Booth
7a324abcd6 Option to show presence information on single line in roster 2015-11-22 00:30:42 +00:00
James Booth
5c08bea8d0 Added /roster indent presence 2015-11-21 22:03:43 +00:00
James Booth
ef0f093efd Added /roster indent resource 2015-11-21 21:49:12 +00:00
James Booth
f54c2e8eca Tidy rosterwin 2015-11-21 21:20:12 +00:00
James Booth
b73ff08a72 Free pref strings 2015-11-21 21:19:28 +00:00
James Booth
4b022687fa Added /roster indent contact 2015-11-21 21:03:53 +00:00
James Booth
6935862195 Don't print empty line when no presence or status displayed in roster 2015-11-20 01:30:49 +00:00
James Booth
99b4fff949 Merge remote-tracking branch 'kiethandi/patch-2' 2015-11-20 00:38:08 +00:00
kiethandi
f948337103 Update privwin.c 2015-11-20 00:34:03 +00:00
James Booth
548f9394be Removed unused priority settings 2015-11-20 00:18:13 +00:00
kiethandi
2c8c394595 Update privwin.c 
Take 2 added include.
 2015-11-20 00:16:51 +00:00
James Booth
16fbdedceb Added /roster char contact 2015-11-20 00:06:46 +00:00
James Booth
3f18c8c35d Added missing include 2015-11-19 23:32:11 +00:00
James Booth
316b6a7b8b Added /roster char header 2015-11-19 23:21:51 +00:00
James Booth
522b9ab6be Show status when show presence disabled 2015-11-18 23:00:06 +00:00
James Booth
8e84d160e6 Added option to show resource priority in roster 2015-11-18 02:14:11 +00:00
James Booth
4505102fa8 Added roster count option 2015-11-18 02:02:49 +00:00
James Booth
edbd2d5843 Don't show offline below contact 2015-11-18 01:10:03 +00:00
James Booth
4efe456e74 Pass offline filter to roster_get_contacts 2015-11-18 01:03:35 +00:00
James Booth
b373cbcfc0 Pass offline filter to roster list functions 2015-11-18 00:25:35 +00:00
James Booth
2260e3bd6f Pass ordering to roster list functions 2015-11-18 00:06:00 +00:00
James Booth
8e8852fa9f Added /roster order name|presence 2015-11-17 23:37:33 +00:00
James Booth
230a14219c Tidy rosterwin.c 2015-11-15 23:28:24 +00:00
James Booth
1d9d893ec0 Tidy rosterwin 2015-11-15 23:18:23 +00:00
James Booth
c31ba8c066 Added _rosterwin_presence() 2015-11-15 23:13:53 +00:00
James Booth
b44ea03022 Added _rosterwin_resource() 2015-11-15 22:54:09 +00:00
James Booth
98a395e933 Show presence when resource hidden 2015-11-15 22:17:36 +00:00
James Booth
badbc3003f Show presence in roster WIP 2015-11-15 21:33:48 +00:00
James Booth
0bb596e14a Added extra fields to TLSCertificate 2015-11-10 22:46:48 +00:00
James Booth
9302188a32 Show current TLS certificate 2015-11-10 01:20:40 +00:00
James Booth
bee3e15ea4 Clear Readline undo list when autocompleting command history 
fixes #667
 2015-11-09 00:34:17 +00:00
James Booth
60215cdf9d Renamed MUC private window functions 2015-11-08 22:08:29 +00:00
James Booth
8a397263dd ui_incoming_private_msg takes ProfPrivateWin, added asserts 2015-11-08 22:01:51 +00:00
James Booth
ebff1fc81e Moved ui_outgoing_private_msg to privwin.c 2015-11-05 23:30:51 +00:00
James Booth
9fcdc5901c Removed ui_new_private_win 2015-11-05 23:28:21 +00:00
James Booth
f1daec663d Added privwin module 2015-11-05 23:20:19 +00:00
James Booth
38255e9be4 Make all mucconfwin functions take ProfMucConfWin 2015-11-02 22:19:01 +00:00
James Booth
9106029261 Added assert check to mucconfwin_field_help 2015-11-02 22:07:07 +00:00
James Booth
2a65aa0030 Added assert check to mucconfwin_form_help 2015-11-02 22:06:12 +00:00
James Booth
a3e9178ea2 Renamed mucconfwin functions 2015-11-02 22:05:17 +00:00
James Booth
a761ea7176 Added mucconfwin module 2015-11-02 21:52:43 +00:00
James Booth
eece15d92c Removed ui_statusbar_new 2015-11-02 21:24:12 +00:00
James Booth
022d20bbdc Removed ui_clear_win 2015-11-02 21:21:52 +00:00
James Booth
84adec83f9 Removed ui_unread 2015-11-02 21:14:55 +00:00
James Booth
7f5b563a81 Removed ui_handle_room_join_error 2015-11-02 21:11:47 +00:00
James Booth
2089eebf09 Removed ui_win_type 2015-11-02 21:07:04 +00:00
James Booth
bcd19c6d16 Removed ui_swap_wins 2015-11-02 21:05:21 +00:00
James Booth
df5b93987f Removed ui_tidy_wins 2015-11-02 21:03:30 +00:00
James Booth
75bce88b8a Renamed ui_switch_win -> ui_focus_win 2015-11-02 20:59:36 +00:00
James Booth
14a81fbbbe Removed ui_handle_recipient_not_found 2015-11-02 20:46:52 +00:00
James Booth
2ea0e1e938 Removed ui_titlebar_presence 2015-11-02 20:39:43 +00:00
James Booth
1c3eadbf1c Removed ui_get_chat_recipients 2015-11-02 20:35:01 +00:00
James Booth
6779c5bf68 mucwin_hide_occupants takes ProfMucWin 2015-11-02 01:01:37 +00:00
James Booth
668f92ece2 mucwin_show_occupants takes ProfMucWin 2015-11-02 00:59:27 +00:00
James Booth
ce0763e160 mucwin_update_occupants takes ProfMucWin 2015-11-02 00:57:13 +00:00
James Booth
6c2617ccda Added assert to mucwin_info 2015-11-02 00:53:54 +00:00
James Booth
1602011e01 mucwin_role_set_error takes ProfMucWin 2015-11-02 00:52:50 +00:00
James Booth
982bc8e066 mucwin_affiliation_set_error takes ProfMucWin 2015-11-02 00:51:12 +00:00
James Booth
c9db9257ae Added assert to mucwin_show_role_list 2015-11-02 00:49:05 +00:00
James Booth
7bedb6c294 mucwin_handle_role_list takes ProfMucWin 2015-11-02 00:47:43 +00:00
James Booth
1aa3c0ea4f mucwin_role_list_error takes ProfMucWin 2015-11-02 00:44:33 +00:00
James Booth
2792c59031 Added assert to mucwin_show_affiliation_list 2015-11-02 00:41:52 +00:00
James Booth
3341e8c202 mucwin_handle_affiliation_list takes ProfMucWin 2015-11-02 00:40:23 +00:00
James Booth
d81dbdb233 mucwin_affiliation_list_error takes ProfMucWin 2015-11-02 00:38:26 +00:00
James Booth
2e81a4efa3 mucwin_broadcast takes ProfMucWin 2015-11-02 00:36:25 +00:00
James Booth
5c53c94253 mucwin_kick_error takes ProfMucWin 2015-11-02 00:33:31 +00:00
James Booth
23ada0d38b mucwin_subject takes ProfMucWin 2015-11-02 00:29:35 +00:00
James Booth
0592c7f9e9 mucwin_requires_config takes ProfMucWin 2015-11-02 00:26:56 +00:00
James Booth
986741dea8 mucwin_message takes ProfMucWin 2015-11-02 00:24:19 +00:00
James Booth
e68784be43 mucwin_history takes ProfMucWin 2015-11-02 00:19:46 +00:00
James Booth
6ed72d8a35 mucwin_nick_change takes ProfMucWin 2015-11-02 00:17:46 +00:00
James Booth
42643391a4 mucwin_occupant_nick_change takes ProfMucWin 2015-11-02 00:16:01 +00:00
James Booth
b3150ef8e1 mucwin_occupant_presence takes ProfMucWin 2015-11-02 00:14:16 +00:00
James Booth
d505a92d1e mucwin_occupant_online takes ProfMucWin 2015-11-01 23:52:16 +00:00
James Booth
3a98bf315c mucwin_occupant_banned takes ProfMucWin 2015-11-01 23:49:45 +00:00
James Booth
cc498110e2 mucwin_occupant_kicked takes ProfMucWin 2015-11-01 23:47:59 +00:00
James Booth
24f283e960 mucwin_occupant_offline takes ProfMucWin 2015-11-01 23:45:54 +00:00
James Booth
8b4bb1c7f1 mucwin_roster takes ProfMucWin 2015-11-01 23:41:45 +00:00
James Booth
d21faa4609 mucwin_room_disco_info takes ProfMucWin 2015-11-01 23:33:50 +00:00
James Booth
363fda82c1 mucwin_room_info_error takes ProfMucWin 2015-11-01 23:30:44 +00:00
James Booth
ed9585376e mucwin_occupant_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:23:49 +00:00
James Booth
799c064dff mucwin_occupant_affiliation_change takes ProfMucWin 2015-11-01 23:14:27 +00:00
James Booth
288c1a9d6e mucwin_occupant_role_change takes ProfMucWin 2015-11-01 23:12:35 +00:00
James Booth
6ea9314f98 mucwin_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:08:02 +00:00
James Booth
c0fc7b51e3 mucwin_affiliation_change takes ProfMucWin 2015-11-01 22:46:24 +00:00
James Booth
e547ae0bcc mucwin_role_change takes ProfMucWin 2015-11-01 22:42:31 +00:00
James Booth
2be3b7d9a2 Tidied ui.h 2015-11-01 22:02:22 +00:00
James Booth
ed2324900a Renamed ui_room_hide_occupants -> mucwin_hide_occupants 2015-11-01 21:57:57 +00:00
James Booth
a08f112fd0 Renamed mucwin_occupants -> mucwin_show_occupants 2015-11-01 21:57:18 +00:00
James Booth
2e08910841 Renamed ui_room_show_occupants -> mucwin_occupants 2015-11-01 21:56:17 +00:00
James Booth
4697393373 Renamed ui_room_update_occupants -> mucwin_update_occupants 2015-11-01 21:55:16 +00:00
James Booth
e4e76ec58b Renamed ui_show_room_info -> mucwin_info 2015-11-01 21:54:31 +00:00
James Booth
67f8faf645 Renamed ui_handle_room_role_set_error -> mucwin_role_set_error 2015-11-01 21:53:12 +00:00
James Booth
50765190f7 Renamed ui_handle_room_affiliation_set_error -> mucwin_affiliation_set_error 2015-11-01 21:52:27 +00:00
James Booth
d47da01c00 Renamed ui_show_room_role_list -> mucwin_show_role_list 2015-11-01 21:51:24 +00:00
James Booth
556985ec39 Renamed ui_handle_room_role_list -> mucwin_handle_role_list 2015-11-01 21:50:32 +00:00
James Booth
2cc5f17871 Renamed ui_handle_room_role_list_error -> mucwin_role_list_error 2015-11-01 21:48:28 +00:00
James Booth
381bce385f Renamed ui_show_room_affiliation_list -> mucwin_show_affiliation_list 2015-11-01 21:46:57 +00:00
James Booth
fa0ed64190 Renamed ui_handle_room_affiliation_list -> mucwin_handle_affiliation_list 2015-11-01 21:45:59 +00:00
James Booth
21d560f068 Renamed ui_handle_room_affiliation_list_error -> mucwin_affiliation_list_error 2015-11-01 21:37:09 +00:00
James Booth
b26e606061 Renamed ui_room_broadcast -> mucwin_broadcast 2015-11-01 21:35:15 +00:00
James Booth
a575ab174c Renamed ui_handle_room_kick_error -> mucwin_kick_error 2015-11-01 21:34:28 +00:00
James Booth
25020df0f0 Renamed ui_room_subject -> mucwin_subject 2015-11-01 21:33:16 +00:00
James Booth
bd922a2651 Renamed ui_room_requires_config -> mucwin_requires_config 2015-11-01 21:32:35 +00:00
James Booth
f435d081b0 Renamed ui_room_message -> mucwin_message 2015-11-01 21:31:54 +00:00
James Booth
29af5d4a3b Renamed ui_room_history -> mucwin_history 2015-11-01 21:30:39 +00:00
James Booth
d7c1c6f9bf Renamed ui_room_nick_change -> mucwin_nick_change 2015-11-01 21:29:48 +00:00
James Booth
27632581eb Renamed ui_room_member_nick_change -> mucwin_occupant_nick_change 2015-11-01 21:28:53 +00:00
James Booth
0ea7636db3 Renamed ui_room_member_presence -> mucwin_occupant_presence 2015-11-01 21:27:56 +00:00
James Booth
7821b2261d Renamed ui_room_member_online -> mucwin_occupant_online 2015-11-01 21:27:00 +00:00
James Booth
1e47749f3a Renamed ui_room_member_banned -> mucwin_occupant_banned 2015-11-01 21:25:55 +00:00
James Booth
b8e1e5a546 Renamed ui_room_member_kicked -> mucwin_occupant_kicked 2015-11-01 21:24:49 +00:00
James Booth
445452696e Renamed ui_room_member_offline -> mucwin_occupant_offline 2015-11-01 21:23:37 +00:00
James Booth
51c9d4186e Renamed ui_room_roster -> mucwin_roster 2015-11-01 21:20:11 +00:00
James Booth
fdd00b33a4 Renamed ui_show_room_disco_info -> mucwin_room_disco_info 2015-11-01 21:19:08 +00:00
James Booth
bb14b19bb1 Renamed ui_handle_room_info_error -> mucwin_room_info_error 2015-11-01 21:18:13 +00:00
James Booth
94f05ff42f Renamed ui_room_occupant_role_and_affiliation_change -> mucwin_occupant_role_and_affiliation_change 2015-11-01 21:17:13 +00:00
James Booth
88206dc39b Renamed ui_room_occupant_affiliation_change -> mucwin_occupant_affiliation_change 2015-11-01 21:16:22 +00:00
James Booth
eae0b59310 Renamed ui_room_occupant_role_change -> mucwin_occupant_role_change 2015-11-01 21:15:14 +00:00
James Booth
1a87132dc7 Renamed ui_room_role_and_affiliation_change -> mucwin_role_and_affiliation_change 2015-11-01 21:14:01 +00:00
James Booth
d706dcd4bc Renamed ui_room_affiliation_change -> mucwin_affiliation_change 2015-11-01 21:12:53 +00:00
James Booth
75b505cf6a Renamed ui_room_role_change -> mucwin_role_change 2015-11-01 21:11:30 +00:00
James Booth
bb5150b062 Added mucwin module 2015-11-01 20:05:43 +00:00
James Booth
aa59cf98b8 xmlwin_show takes window as argument 2015-11-01 19:45:35 +00:00
James Booth
db4bcd3e6d Added xmlwin module 2015-11-01 19:39:36 +00:00
James Booth
7e386fbf00 Removed ui_open_xmlconsole_win() 2015-11-01 19:33:01 +00:00
James Booth
9eae20298f Removed ui_create_xmlconsole_win() 2015-11-01 19:29:59 +00:00
James Booth
486d2e0495 Removed ui_xmlconsole_exists 2015-11-01 19:26:31 +00:00
James Booth
be90e44d4a Tidy ui.h 2015-11-01 19:02:09 +00:00
James Booth
d6e4b74802 Removed ui_input_nonblocking() 2015-11-01 18:56:34 +00:00
James Booth
8195ab42cb Removed ui_ paging functions 2015-11-01 18:49:53 +00:00
James Booth
4fa2efc7ca Removed inp_win_clear() 2015-11-01 18:45:57 +00:00
James Booth
be4b07102c Removed ui_input_clear() 2015-11-01 18:42:42 +00:00
James Booth
4c42ce9701 Removed ui_readline() 2015-11-01 18:38:21 +00:00
James Booth
17488ca346 Added missing config.h includes 2015-10-31 23:38:08 +00:00
James Booth
24896a3bfb Added HAVE_LIBOTR checks 2015-10-31 23:22:23 +00:00
James Booth
86354a2bc5 Added /subject append <text> 2015-10-29 20:55:37 +00:00
James Booth
fa8a5323b6 Reordered ui.h 2015-10-27 23:42:26 +00:00
James Booth
3f7f1186a6 Tidied remaining chatwin functions 2015-10-27 23:39:26 +00:00
James Booth
77e854c1e8 Renamed _win_show_history -> _chatwin_history 2015-10-27 23:28:59 +00:00
James Booth
31016a2150 Tidied chatwin_outgoing_carbon 2015-10-27 23:25:18 +00:00
James Booth
e7148bf82d Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg 2015-10-27 23:20:03 +00:00
James Booth
af1124f28f Renamed ui_incoming_msg -> chatwin_incoming_msg 2015-10-27 23:18:42 +00:00
James Booth
ea09dcda18 Renamed ui_new_chat_win -> chatwin_new 2015-10-27 23:15:28 +00:00
James Booth
dfd55d24cd Moved ui_handle_otr_error 2015-10-27 23:12:46 +00:00
James Booth
ae89028772 Renamed ui_recipient_gone -> chatwin_recipeint_gone 2015-10-27 23:06:27 +00:00
James Booth
62c2febc11 Tidied ui_recipient_gone 2015-10-27 23:05:20 +00:00
James Booth
ff9abecd50 Combined chatwin OTR SMP functions 2015-10-27 22:25:26 +00:00
James Booth
40dcd59727 Renamed chatwin OTR functions 2015-10-27 21:23:56 +00:00
James Booth
0fd616167e Removed ui_events module 2015-10-27 20:49:06 +00:00
James Booth
8087053f49 Removed ui_ev_focus_win 2015-10-27 20:40:42 +00:00
James Booth
124aaa9809 remaining otr functions take ProfChatWin 2015-10-27 00:19:22 +00:00
James Booth
8bd74cefcf ui_smp_successful takes ProfChatWin 2015-10-26 23:50:56 +00:00
James Booth
3cea2bc4f4 ui_smp_aborted takes ProfChatWin 2015-10-26 23:45:39 +00:00
James Booth
0b51f4d36f ui_smp_unsuccessful_receiver takes ProfChatWin 2015-10-26 23:40:37 +00:00
James Booth
d11f8d5ffc ui_smp_unsuccessful_sender takes ProfChatWin 2015-10-26 23:36:11 +00:00
James Booth
3ce55de1e1 ui_smp_recipient_initiated_q takes ProfChatWin 2015-10-26 23:29:01 +00:00
James Booth
55e857d6a8 ui_smp_recipient_initiated takes ProfChatWin 2015-10-26 23:22:59 +00:00
James Booth
93c3feeacf Add assert checks for ProfChatWin functions 2015-10-26 23:11:38 +00:00
James Booth
9d3bcf5f90 ui_gone_insecure takes ProfChatWin 2015-10-26 23:10:30 +00:00
James Booth
4fb0b4b0da ui_gone_secure takes ProfChatWin 2015-10-26 23:04:45 +00:00
James Booth
2efaa464bf ui_message_receipt takes ProfChatWin 2015-10-26 22:54:06 +00:00
James Booth
8f45f332ad Removed ui_chat_win_exists 2015-10-26 22:43:32 +00:00
James Booth
c99ff8d941 Extracted chatwin.c 2015-10-26 22:35:30 +00:00
James Booth
8966c59fe1 Merge remote-tracking branch 'jubalh/compwarn' 2015-10-26 20:52:45 +00:00
James Booth
ab9bdffab6 Merge remote-tracking branch 'jubalh/ptr_fix' 2015-10-26 20:47:48 +00:00
James Booth
d8fc7faa36 Removed ui_about() function 2015-10-26 20:37:50 +00:00
Michael Vetter
86c3c50219 Get rid of compiler warning concerning NULL pointer 
Casting the into correct type.
 2015-10-26 14:50:54 +01:00
Michael Vetter
a6f27d3ea7 Fix pointer dereferencing 
Setting the pointer to NULL had no effect outside the function so far.
 2015-10-26 14:24:11 +01:00
James Booth
2ce43b633f Applied coding style to src/ui/ 2015-10-25 23:31:11 +00:00
James Booth
4a6b729a54 Applied coding style to src/ui/core.c 2015-10-25 23:11:27 +00:00
James Booth
1096603234 Applied coding style to src/ui/console.c 2015-10-25 22:59:35 +00:00
James Booth
559ff72cf5 Applied coding style to src/ui/buffer.h src/ui/buffer.c 2015-10-25 22:50:10 +00:00
James Booth
1d4d693a53 Merge remote-tracking branch 'jubalh/jub' 2015-10-24 21:42:04 +01:00
James Booth
6640a0891f Force tls on all connections, add tls policy account property 2015-10-18 03:06:23 +01:00
James Booth
eca7390951 Implemented /script show 2015-10-17 22:58:45 +01:00
James Booth
a35cbea732 Implemented /script list 2015-10-17 22:30:01 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
d38e10828e Added /lastactivity on|off 2015-10-14 22:09:18 +01:00
James Booth
85764ddb53 Added TLS show to UI preferences 2015-10-14 00:58:33 +01:00
James Booth
ef832ce526 Add preference for showing TLS indicator in titlebar 
Issue #616
 2015-10-14 00:48:11 +01:00
James Booth
c9165ef9d2 Title bar TLS indicator 
Issue #616
 2015-10-14 00:29:22 +01:00
Michael Vetter
e434b1bbf8 Create is_notify_enabled function 
The same code was used on two different occasions. I put it into a
function.
 2015-10-12 09:29:04 +02:00
Michael Vetter
4730dca546 Undefine argument list 
Call va_end() to correclty stop using the argument list.
 2015-10-12 09:29:04 +02:00
Michael Vetter
dd2ce7a5bf Reduce scope of variables in ui/core 
Not as important as the other one (where there was a double
declaration). But for the sake of consistency.
 2015-10-12 09:29:01 +02:00
James Booth
de15d47be4 Fixed resize during password and tls commands 2015-10-06 23:21:47 +01:00
James Booth
b9948a4c01 Added time format perferences per window type 2015-09-30 22:34:27 +01:00
James Booth
99fc70bd92 Added last activity time format option 2015-09-29 23:30:23 +01:00
James Booth
09833fb0dd Unmap key sequence Alt+= 
Fixes #629
 2015-09-29 21:08:42 +01:00
James Booth
54e225aa53 Added auto xa option, tidied autoaway code 2015-09-27 23:08:30 +01:00
James Booth
100db7c36c Set status to what it was before autoaway 2015-09-25 22:55:44 +01:00
James Booth
9414ad268d Prompt user to allow or deny untrusted TLS certificates 2015-09-22 21:42:05 +01:00
James Booth
d7bba74091 Moved /winstidy command to /wins autotidy 2015-09-19 23:31:04 +01:00
James Booth
b468fd7ae4 PGP: UI tweaks for passphrase request 2015-09-01 21:25:58 +01:00
James Booth
7dc1b9d428 Fixed passing from arg in PGP ask passphrase 2015-09-01 20:33:23 +01:00
James Booth
1f4fd0fcb3 Added UI function to get PGP passphrase 2015-09-01 20:16:04 +01:00
James Booth
b4722632b6 Split PGP incoming and outgoing message handling 2015-08-30 01:32:13 +01:00
James Booth
98ea744648 Added /otr char and /pgp char 2015-08-26 01:24:53 +01:00
James Booth
1bf584793f Added preference for encryption char 2015-08-26 01:06:10 +01:00
James Booth
f998ab8f3b Display special char for encrypted messages 2015-08-26 00:42:56 +01:00
James Booth
b8b54f91a5 Leave chat rooms before receiving self unavailable presence 
Fixes bug for servers that don't send the self presence
 2015-08-23 23:56:34 +01:00
James Booth
0410dd90f1 Free timestamp and id for receipts 2015-08-09 23:08:36 +01:00
James Booth
783342a48c Free timestamps and carbons stanzas 2015-08-09 00:40:37 +01:00
James Booth
406b821b35 Show software version result in current window 2015-08-06 01:56:52 +01:00
brandenbyers
4e5f197eb4 Fix typo 2015-08-05 13:10:59 -05:00
James Booth
2a92169351 Use id handler for software version requests, handle errors 2015-08-05 00:26:29 +01:00
James Booth
41c93c3350 Handle larger than line words in wrapping 2015-07-30 01:31:11 +01:00
James Booth
8ec931eb84 Added cons_show_padded 2015-07-29 23:48:28 +01:00
James Booth
79f618367d Do not print newline when curs position 0 2015-07-29 23:03:00 +01:00
James Booth
5576b88a04 Added indent padding 2015-07-29 22:48:03 +01:00
James Booth
08f43bee8e Retagged commands 2015-07-27 23:55:04 +01:00
James Booth
eb550eedb3 Added tags to command definitions 2015-07-27 01:06:10 +01:00
James Booth
bd32f4dc47 Show command header in help output 2015-07-26 03:01:14 +01:00
James Booth
34537e2fb1 Removed old command help 2015-07-26 02:05:53 +01:00
James Booth
36ebf0fc17 Updated help category output 2015-07-26 01:27:42 +01:00
James Booth
44d7a152a4 Added connect to new help format 2015-07-24 00:33:38 +01:00
James Booth
22111bf75b Moved help and about to new format 2015-07-23 23:05:33 +01:00
James Booth
b63ede7964 Fixed time preference display 2015-07-19 22:56:22 +01:00
James Booth
46e2f11b93 Removed /mouse command 2015-07-19 22:48:12 +01:00
Daniel
806afcc014 Allow hiding of empty presence groups: /roster {show,hide} empty (default is show) 2015-07-08 13:11:56 +02:00
James Booth
fb8b223876 Removed subscribed check when displaying roster panel 2015-07-02 00:01:37 +01:00
James Booth
d8c410d289 Don't write chars during password input 2015-07-01 21:00:31 +01:00
James Booth
446f5f0aa1 Merge remote-tracking branch 'pasis/ui-ignore-EINTR' 2015-07-01 20:55:22 +01:00
James Booth
106e909fbd Merge remote-tracking branch 'incertia/time' 
Conflicts:
	src/config/preferences.c
 2015-07-01 20:16:09 +01:00
James Booth
d5f79c7b35 Use reference counts for GDateTimes #516 2015-06-30 16:21:21 +01:00
James Booth
dd206ef637 WIP fix for #516, needs memory cleanup 2015-06-29 23:48:41 +01:00
Dmitry Podgorny
f24019ee4d ui: Ignore EINTR in inp_readline() 
EINTR is usual situation during resizing of terminal window.
 2015-06-25 18:17:10 +00:00
James Booth
fed55b5459 Do not update UI whilst receiving password 2015-06-25 00:33:28 +01:00
James Booth
48a2cad8fd free muc autocompleter result 2015-06-24 20:20:55 +01:00
James Booth
17919298f7 Free prefs strings, check for NULLs when closing pgp module 2015-06-24 14:27:40 +01: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
James Booth
86acd4649b Added PGP prefs 2015-06-22 21:09:14 +01:00
James Booth
446027b950 Moved setting otr.warn -> enc.warn 2015-06-21 21:07:57 +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
6617bb5a2b Added window encyption mode for PGP 2015-06-20 23:49:24 +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
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
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
0ef00e87ab Merge branch 'master' into openpgp 2015-06-13 16:27:20 +01:00
James Booth
e0783e20db Renamed otr trusted window property 2015-06-13 01:13:56 +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
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
83bed119e4
remove memory leak from creating a gdatetime string 2015-05-29 20:55:33 -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
80665ea051 Added rooms iq test 2015-05-24 04:13:28 +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
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
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +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
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
aca102f542 Merge branch 'master' into pgp 2015-05-04 01:34:18 +01:00
James Booth
c8eaaa0ce9 Added ui_ev_new_private_win to ui events 2015-05-04 01:31:27 +01:00