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

4471 Commits

Author SHA1 Message Date
James Booth
a67d199581 Add connection_shutdown() 2016-05-10 23:27:16 +01:00
James Booth
3d20c85ada Remove JABBER_STARTED, JABBER_UNDEFINED connection states 2016-05-10 23:18:11 +01:00
James Booth
22c4d91c50 Remove _session_free_session_data from session.c 2016-05-10 22:49:58 +01:00
James Booth
02bc4f217c Tidy connection.c 2016-05-10 22:09:09 +01:00
James Booth
5cb6b174cc Tidy connection.c 2016-05-10 21:59:41 +01:00
James Booth
030ac9e4e1 Fixed compile 2016-05-08 23:48:29 +01:00
James Booth
cd5d242207 Tidy session.c 2016-05-08 21:47:52 +01:00
James Booth
ec51ae689c Free features on disconnect 2016-05-08 03:14:22 +01:00
James Booth
ac3ab39e23 Use hash table for disco features 2016-05-08 03:04:36 +01:00
James Booth
29380a39cd Remove connection_get_disco_infos() 2016-05-08 02:37:02 +01:00
James Booth
188df60cfe Rename diso_items->diso_infos 2016-05-08 02:30:34 +01:00
James Booth
31e6cc8e38 Add connection_get_disco_info() 2016-05-08 02:25:34 +01:00
James Booth
137202e5dd Add connection_item_for_feature() 2016-05-08 01:45:22 +01:00
James Booth
f28655c5c8 Move logic to connection_set_disco_items 2016-05-08 01:10:42 +01:00
James Booth
f1cf444e05 Move conneciton initialisation to _connection_handler 2016-05-08 00:21:06 +01:00
James Booth
2f61f8d646 Move xmpp_initialise() to conneciton.c 2016-05-07 23:29:19 +01:00
James Booth
6ce8edc194 Move disco info struct to connection 2016-05-07 23:28:16 +01:00
James Booth
9596591610 Move available resources to connection struct 2016-05-07 23:04:50 +01:00
James Booth
7f1beadea9 Rename xmpp types 2016-05-06 02:31:55 +01:00
James Booth
81e95966cf Remove redundant tls secured function 2016-05-06 02:18:31 +01:00
James Booth
c009144b3d Tidy connect function 2016-05-06 02:08:10 +01:00
James Booth
3cb60399a1 Move connection_connect 2016-05-06 02:02:23 +01:00
James Booth
579d062063 Move send stanza function 2016-05-06 01:51:58 +01:00
James Booth
b6c4a2029f Move conn is secure function 2016-05-06 01:49:27 +01:00
James Booth
8950dbb768 Move tls peer cert function 2016-05-06 01:47:19 +01:00
James Booth
31b0f0b0c8 Move uuid functions 2016-05-06 01:16:13 +01:00
James Booth
d1c71e98f4 Move connection fulljid function 2016-05-06 01:12:54 +01:00
James Booth
cc485ed338 Tidy session.c 2016-05-06 01:10:12 +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
f6fa63b374 Renamed connection.c -> session.c 2016-05-05 22:10:10 +01:00
James Booth
ab7ddeaaa3 Merge branch 'master' into plugins 2016-05-04 01:20:53 +01:00
James Booth
ccabc08fef Tidy xmpp headers 2016-05-04 01:19:51 +01:00
James Booth
b0fc34638a Merge branch 'master' into plugins 2016-05-03 23:51:41 +01:00
James Booth
2e1eb9210a Remove userdata from _blocklist_result_handler 2016-05-02 22:49:30 +01:00
James Booth
aabe3afff8 Rename stanza handler init functions 2016-05-02 22:34:43 +01:00
James Booth
39fb05577a Rename id_handler_add -> iq_id_handler_add 2016-05-02 21:50:39 +01:00
James Booth
7aeed556d6 Merge branch 'master' into plugins 2016-05-02 01:00:03 +01:00
James Booth
92780f3e6e Remove free DiscoInfo values 2016-05-02 00:59:37 +01:00
James Booth
9e5229f8f7 Merge branch 'master' into plugins 2016-05-02 00:44:43 +01:00
James Booth
31ab43ea2d Free stanza text and DiscoInfo features 2016-05-02 00:40:16 +01:00
James Booth
2bacd43a16 Free stanza text on plugin send hooks 2016-05-01 23:41:57 +01:00
James Booth
6499ea390a Merge branch 'master' into plugins 2016-05-01 20:36:25 +01:00
James Booth
6df6fed305 Disable tray icon by default 2016-05-01 20:33:42 +01:00
James Booth
bebb259f08 Merge branch 'master' into plugins 2016-05-01 20:25:18 +01:00
James Booth
d2df850f38 Update /blocked help 2016-05-01 20:20:15 +01:00
James Booth
5a48b7b7d5 Use current jid for /blocked add in chat win 2016-05-01 20:06:34 +01:00
James Booth
b8c94376aa Add /blocked command 2016-05-01 19:39:39 +01:00
James Booth
3ea7cf882e Merge branch 'master' into plugins 2016-05-01 01:07:51 +01:00
James Booth
a2efda19cc Merge remote-tracking branch 'pasis/const-char' 2016-05-01 00:39:16 +01:00
James Booth
24616b7c4d Merge branch 'master' into plugins 2016-04-30 23:31:29 +01:00
James Booth
623fbe9e47 Plugins: Added prof_disco_add_feature() 2016-04-30 23:00:07 +01:00
James Booth
a718e6f91b Refactored /account set commands 2016-04-28 01:13:42 +01:00
James Booth
d4789ac375 Fixed compiler errors 2016-04-27 22:10:27 +01:00
James Booth
df30d4ba52 Check first entry in command sub_funcs 2016-04-27 21:52:58 +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
21b75ce3ae Merge branch 'master' into plugins 2016-04-27 01:39:41 +01:00
James Booth
5687c3e419 Free inputrc string
fixes #797
2016-04-27 01:36:14 +01:00
James Booth
8d707de456 Merge branch 'master' into plugins 2016-04-27 00:41:43 +01:00
James Booth
ce32814679 Updated Command structure comments 2016-04-27 00:03:24 +01:00
James Booth
d4aa73159e Merge branch 'master' into subcmds 2016-04-26 23:56:12 +01:00
James Booth
f5656138c6 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2016-04-26 23:43:58 +01:00
James Booth
043a673fe1 Merge remote-tracking branch 'asdil12/xep_0363_http_file_upload' 2016-04-26 23:30:26 +01:00
James Booth
4ca6296fb7 Fix OSX compile 2016-04-26 23:50:56 +02:00
James Booth
65960dfbb2 Fixed cygwin compile (again) 2016-04-26 23:50:56 +02:00
James Booth
9d263d7c83 Fixed cygwin compile 2016-04-26 23:50:55 +02:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02:00
James Booth
0ff29b3d2e Added sub commands to command structure 2016-04-26 20:29:45 +01:00
Dominik Heidler
28e260c7da Cache all disco items and features on connect 2016-04-20 00:19:40 +02:00
James Booth
ab5d418fa3 Merge branch 'master' into plugins 2016-04-18 00:37:36 +01:00
James Booth
20a0313d17 Show correct tray icon immediately on enable 2016-04-18 00:35:03 +01:00
James Booth
12727744ab Load/destroy tray icons on init/shutdown 2016-04-18 00:26:17 +01:00
James Booth
de65f505a8 Moved gtk specific code to tray.c 2016-04-18 00:07:15 +01:00
James Booth
507ea5746c Grouped tray icon initialisation code 2016-04-17 23:57:05 +01:00
James Booth
8ae6baddb3 Merge branch 'master' into plugins 2016-04-17 23:47:32 +01:00
James Booth
153552ed07 Remove redundant return value from _cmd_set_boolean_preference 2016-04-17 23:46:29 +01:00
James Booth
f179d47db0 Merge branch 'master' into plugins 2016-04-17 23:35:57 +01: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
6cc04bc3ba Merge branch 'muc-hooks' 2016-04-15 22:58:32 +01:00
James Booth
feeac48cf3 Merge remote-tracking branch 'asdil12/help' 2016-04-15 22:50:00 +01:00
James Booth
8f009c3c8d Plugins fixed return values for python stanza hooks 2016-04-15 22:37:44 +01:00
James Booth
d90c47f287 Plugins: Added more muc hooks 2016-04-15 22:24:50 +01:00
Dominik Heidler
02bad7af28 Add /command? shortcut to view /help command 2016-04-13 10:47:53 +02:00
James Booth
2e60b19fec Merge branch 'master' into plugins 2016-04-13 00:19:41 +01:00
James Booth
b3a3351a35 Plugins: Added account_name and fulljid to prof_init hook 2016-04-13 00:10:37 +01:00
James Booth
1d37c8bc78 Merge branch 'master' into plugins 2016-04-12 23:26:17 +01:00
James Booth
46687aeced Only complete unloaded plugins on /plugins load 2016-04-12 23:25:31 +01:00
James Booth
85ca7c10c8 Merge branch 'master' into plugins 2016-04-12 23:01:28 +01:00
James Booth
8ff9fd7091 Execute python string to append plugin path 2016-04-12 02:31:28 +01:00
James Booth
247276146c Merge branch 'master' into plugins
Conflicts:
	configure.ac
2016-04-11 00:30:19 +01:00
James Booth
697db019d5 Merge remote-tracking branch 'Dav1d23/master'
Conflicts:
	Makefile.am
	install-all.sh
2016-04-11 00:23:36 +01:00
David
b300fa5baf Use log facilities instead of printing on the stderr 2016-04-10 15:44:37 +02:00
David
92a50000c2 Re-introduce gtk_use boolean
This param is still actual, in case the environemnt does not
support gtk initialization.

Fix a GTK assert on the way (GTKStatusIcon is not a Widget, but a plain
GObject).
2016-04-10 15:44:37 +02:00
James Booth
9fd5f18819 Merge branch 'master' into plugins 2016-04-10 01:24:13 +01:00
James Booth
5ddde3e59a Fixed /plugins help 2016-04-10 01:23:35 +01:00
James Booth
b63bdf8d0a Merge branch 'master' into plugins
Conflicts:
	src/plugins/plugins.c
2016-04-10 01:20:24 +01:00
James Booth
03ab8baf4d Added /plugins load command 2016-04-10 01:15:11 +01:00
James Booth
d59c6dde0d Merge branch 'master' into plugins 2016-04-09 20:20:17 +01:00
James Booth
21aa08fdb1 Fixed typos 2016-04-09 20:19:50 +01:00
James Booth
d36ff0df8c Merge remote-tracking branch 'origin/master' into plugins 2016-04-08 01:18:06 +01:00
James Booth
699e08b238 Fixed timestamp for on_room_history_message 2016-04-08 01:17:22 +01:00
James Booth
93672eba9f Plugins: Added on_room_history_message 2016-04-08 00:11:33 +01:00
James Booth
2f432a942d Plugins: Added completer_clear 2016-04-07 23:25:47 +01:00
James Booth
7ca6084657 Plugins: Added on_room_win_focus 2016-04-07 22:15:03 +01:00
James Booth
271278dd20 Plugins: Added on_chat_win_focus 2016-04-07 22:06:14 +01:00
James Booth
bfdc3b8807 Plugins: Added completer_remove 2016-04-07 21:25:12 +01:00
James Booth
a328367eb4 Plugins: Renamed register_ac->completer_add 2016-04-07 20:49:23 +01:00
James Booth
9ff4fe7069 Merge branch 'master' into plugins 2016-04-07 01:40:02 +01:00
James Booth
2ba121aef3 Room mention case insensitive by default 2016-04-07 01:37:04 +01:00
James Booth
d09078551a Merge branch 'master' into plugins 2016-04-07 01:15:17 +01:00
James Booth
bdb1287a4f Free mentions list 2016-04-07 01:14:12 +01:00
James Booth
b69bec160d Merge branch 'master' into plugins 2016-04-07 01:05:49 +01:00
James Booth
f243e333fc Added whole word matches for room mention 2016-04-07 01:01:27 +01:00
James Booth
6edf3b3f94 Merge branch 'master' into mention-config 2016-04-04 23:44:04 +01:00
James Booth
073c496526 Merge branch 'master' into plugins 2016-04-04 23:43:25 +01:00
James Booth
1de11678dc Added reset to /notify help 2016-04-04 23:41:30 +01:00
James Booth
afa2c0f5ba Added mention match preferences 2016-04-03 23:33:21 +01:00
James Booth
d9344b00fe Added prof_strstr function 2016-04-03 22:30:24 +01:00
Dominik Heidler
4b1481987d Fix typo: diso -> disco 2016-04-01 12:09:35 +02:00
James Booth
1074825f63 Merge branch 'master' into plugins 2016-03-31 23:19:40 +01:00
James Booth
6f81f2b845 Removed newline handling code from rosterwin.c 2016-03-31 23:14:51 +01:00
James Booth
17175bb672 Merge branch 'master' into plugins
Conflicts:
	src/plugins/plugins.c
2016-03-31 21:16:19 +01:00
James Booth
9b177a9e01 Removed #AX_PREFIX_CONFIG_H 2016-03-31 21:05:02 +01:00
James Booth
46385ae376 Merge branch 'master' into plugins 2016-03-31 20:17:30 +01:00
James Booth
c91ce78a04 Added missing include in callbacks.c 2016-03-31 20:16:53 +01:00
James Booth
1592fbbd35 Merge branch 'master' into plugins 2016-03-30 23:18:54 +01:00
James Booth
759d9ccb8d Added plugins presence hooks 2016-03-30 23:18:12 +01:00
David
1e60d17d7c libgtk is now optional
Having the lib is no more needed.
2016-03-30 23:21:41 +02:00
James Booth
6847c3412d Merge branch 'master' into plugins 2016-03-29 23:51:52 +01:00
James Booth
194c53c4fa Plugins: Added basic incoming message function 2016-03-29 23:44:54 +01:00
James Booth
5f32c9456c Merge branch 'master' into plugins 2016-03-29 22:43:47 +01:00
James Booth
94b9b1d8e4 Merge branch 'master' into stanza-hooks 2016-03-29 21:44:18 +01:00
James Booth
ecbc18e241 Merge branch 'master' into plugins 2016-03-29 21:43:25 +01:00
James Booth
66467f976f PGP: Fixed array size for encryption keys 2016-03-29 21:30:41 +01:00
James Booth
7b138b71db PGP: Also encrypt using sender public key 2016-03-29 21:24:37 +01:00
James Booth
c6730783bf Removed duplicate typedef 2016-03-28 15:44:03 +01:00
James Booth
d39e48ba18 Use one stanza handler per type (message, iq, presence)
Allows plugins to stop stanza processing
2016-03-28 01:25:48 +01:00
James Booth
8933d59b03 Added basic stanza receive eooks 2016-03-27 21:36:29 +01:00
James Booth
005d5b6e1d Merge branch 'master' into plugins 2016-03-26 17:12:37 +00:00
James Booth
18555ffcb4 Allow sending stanzas in xml console 2016-03-26 17:11:19 +00:00
James Booth
2881a6c753 Merge branch 'master' into plugins 2016-03-26 16:45:49 +00:00
James Booth
7b34f72007 Use xmpp_send_raw_string instead of xmpp_send_raw 2016-03-26 16:44:02 +00:00
James Booth
fb18762dbd Merge branch 'master' into plugins 2016-03-26 15:50:28 +00:00
James Booth
d0397f3da5 Added stanza send hooks for plugins 2016-03-26 15:50:16 +00:00
James Booth
98a6df8d81 Merge branch 'master' into plugins
Conflicts:
	src/plugins/profapi.h
2016-03-26 02:21:16 +00:00
James Booth
ce9b0836a0 Added integer settings for plugins 2016-03-26 02:19:30 +00:00
James Booth
e2b02733df Added plugin string settings 2016-03-26 01:48:42 +00:00
James Booth
a4e6d50a40 Added boolean settings for plugins 2016-03-25 22:06:24 +00:00
James Booth
4d42734545 Merge branch 'master' into plugins
Conflicts:
	src/plugins/api.h
	src/plugins/profapi.c
	src/plugins/profapi.h
2016-03-23 22:59:11 +00:00
James Booth
4c913aa08b Added prof_send_stanza to plugins API 2016-03-23 22:57:03 +00:00
James Booth
fbbde85ee2 Merge branch 'master' into plugins 2016-03-22 00:31:06 +00:00
James Booth
503fc9e393 Update roster count on carbons 2016-03-22 00:28:22 +00:00
James Booth
6f537c3818 Add PGP decryption for incoming/outgoing carbons 2016-03-22 00:20:29 +00:00
James Booth
f0fe7eae32 Merge branch 'master' into plugins 2016-03-16 00:07:39 +00:00
James Booth
1075f07ff5 Parse plugin args with freetext parser
Also allow adding to plugin autocompleters
2016-03-15 22:32:44 +00:00
David
bdad30b2d9 This case was clearly not tested locally, so many failures here.
I guess now this should be fine, at least for the no gui case.
Locally it is working fine btw.

I miss Gerrit and the ability to test before pushing right now... :'(
2016-03-13 17:52:49 +01:00
David
028d24283e fix no gtk init 2016-03-13 17:50:42 +01:00
David
72856f9b6c typo 2016-03-13 17:12:01 +01:00
David
e43f3e95c0 fix possible free(NULL) 2016-03-13 17:09:58 +01:00
David
098d84ef73 Merge branch 'tray_icon' into HEAD
Let's thanks Aline <linuxine@gmail.com> for the icons.

Enjoy!
2016-03-12 17:37:46 +01:00
David
520eee23a9 fixing leakings 2016-03-12 16:55:52 +01:00
James Booth
5b2390e20f Merge branch 'master' into plugins
Conflicts:
	.travis.yml
	Makefile.am
	configure-plugins
	configure.ac
	src/plugins/plugins.c
	src/plugins/plugins.h
	src/plugins/python_api.c
	src/plugins/python_plugins.c
2016-03-11 00:15:26 +00:00
James Booth
11356fec01 Merge branch 'master' into plugins-python 2016-03-10 22:23:56 +00:00
James Booth
af7cf0c334 Merge branch 'master' into plugins 2016-03-10 22:22:32 +00:00
James Booth
185405b9d1 Fixed PLATFORM_CYGWIN references 2016-03-10 22:21:56 +00:00
David
82de077b02 read icons from local dir
if desired, icons could be put in the .config dir.
In this case, these icons will be read, instead of the other ones.
2016-03-10 22:45:16 +01:00
James Booth
d157e9bf71 Plugins: Fix python threading
Release global interpreter lock during api calls
2016-03-09 23:36:22 +00:00
David
4abdad03ec Fix icons when installed in share... it is working now! 2016-03-09 20:09:31 +01:00
James Booth
85abab6bf9 Merge branch 'master' into plugins-python 2016-03-08 20:28:51 +00:00
James Booth
a17b6c7232 Merge branch 'master' into plugins 2016-03-08 20:28:09 +00:00
James Booth
1ddfa47313 Free TLSCertificate memory 2016-03-08 20:25:36 +00:00
David
718a708b93 Use a folder to add icons
NOTE: it is not working in this release, I have to get how to retrieve
icons from folder.
2016-03-07 22:26:48 +01:00
James Booth
1a7d664b85 Merge branch 'master' into plugins 2016-03-07 20:49:30 +00:00
James Booth
9850e041c8 Merge branch 'master' into plugins-python 2016-03-07 20:44:18 +00:00
James Booth
5cabcf9b79 Plugins: Added callbacks init and close functions
Included destroy function in PluginWindowCallback
2016-03-07 20:36:25 +00:00
David
d1177d3ade better icons 2016-03-07 20:10:59 +01:00
James Booth
e4071015ea Merge branch 'master' into plugins-python 2016-03-07 18:42:02 +00:00
James Booth
c849fc3e45 Merge branch 'master' into plugins 2016-03-07 18:41:32 +00:00
James Booth
72f940360d Free GLists in plugin autocompleters 2016-03-07 18:32:32 +00:00
James Booth
958dc6b184 Free GList in wins_get_plugin 2016-03-07 18:30:13 +00:00
James Booth
355adb117c Added WIN_PLUGIN case to win_free() 2016-03-07 18:24:04 +00:00
James Booth
35e456aebd Merge branch 'master' into plugins-python 2016-03-07 17:15:48 +00:00
James Booth
4c8f004a01 Merge branch 'master' into plugins 2016-03-07 17:15:21 +00:00
Klement Sekera
e1b15182a4 Fix typo maxinum->maximum 2016-03-07 14:06:10 +01:00
David
dc0c3cc699 Introduce Tray Icon for Profanity
Add tray icon for profanity based on Gtk StatusIcon.
Different icon is displayed in case the user has unread messages.
2016-03-06 19:10:46 +01:00
James Booth
581b6e2cf1 Merge branch 'master' into plugins-python 2016-03-03 00:32:48 +00:00
James Booth
5485a76ef3 Merge branch 'master' into plugins 2016-03-03 00:32:24 +00:00
James Booth
09cfbb7e05 Fixed /help group formatting 2016-03-03 00:31:27 +00:00
James Booth
5ddf379ffd Merge branch 'master' into plugins-python 2016-03-01 00:04:38 +00:00
James Booth
d41728deda Merge branch 'master' into plugins 2016-03-01 00:03:58 +00:00
James Booth
7fdf50eb31 Add plugin wins to /win and /close autocompletion 2016-03-01 00:03:11 +00:00
James Booth
681d52c62c Merge branch 'master' into plugins 2016-02-28 23:21:22 +00:00
James Booth
da7e59bc86 Merge remote-tracking branch 'origin/master' 2016-02-28 23:18:50 +00:00
James Booth
21f6e88c3b Added current_win_is_console to python API 2016-02-28 23:12:53 +00:00
James Booth
c81b05b919 Merge branch 'master' into plugins-python 2016-02-28 23:08:32 +00:00
James Booth
ab08d0a378 Added current_win_is_console to plugins api 2016-02-28 23:06:45 +00:00
James Booth
25c9b19562 Merge branch 'master' into plugins-python 2016-02-28 19:06:13 +00:00
James Booth
ef804eda21 Merge branch 'master' into plugins 2016-02-28 19:05:54 +00:00
James Booth
accde2a61c Fixed cygwin compile 2016-02-28 19:05:26 +00:00
James Booth
d458e930d1 Merge branch 'master' into plugins-python 2016-02-25 01:52:32 +00:00
James Booth
d249d2d998 Merge branch 'master' into plugins 2016-02-25 01:52:10 +00:00
James Booth
fbd913ec62 Remove default from plugin theme NULL checks 2016-02-25 01:51:33 +00:00
James Booth
f507a6f541 Merge branch 'master' into plugins-python 2016-02-25 01:18:48 +00:00
James Booth
07a0caddda Merge branch 'master' into plugins 2016-02-25 01:18:22 +00:00
James Booth
c562702ab9 Check for NULLs before testing plugin theme 2016-02-25 01:17:47 +00:00
James Booth
661cda3b10 Merge branch 'master' into plugins-python 2016-02-25 00:14:06 +00:00
James Booth
18bf080e91 Merge branch 'master' into plugins 2016-02-25 00:12:37 +00:00
James Booth
51c6cefafd Call plugin disconnect hook before disconnecting on autoping fail
fixes #746
2016-02-25 00:10:22 +00:00
James Booth
f18fbe333a Merge branch 'master' into plugins-python 2016-02-24 23:54:25 +00:00
James Booth
9e4e56e14e Merge branch 'master' into plugins 2016-02-24 23:53:50 +00:00
James Booth
5b34e11e45 Added missing string.h include to plugins/api.c 2016-02-24 23:52:59 +00:00
James Booth
e3130dbe82 Merge branch 'master' into plugins-python 2016-02-24 01:00:39 +00:00
James Booth
34b3e3a8f7 Merge branch 'master' into plugins 2016-02-24 01:00:11 +00:00
James Booth
9d31ce49c3 Added missing stdlib.h include 2016-02-24 00:59:28 +00:00
James Booth
d6e85e5cd6 Added python_api_cons_bad_cmd_usage 2016-02-24 00:48:34 +00:00
James Booth
2783c84a13 Added python support to -v 2016-02-24 00:36:23 +00:00
James Booth
0fc0b3eeec Added python plugins code 2016-02-24 00:31:55 +00:00
James Booth
41d88b0581 Merge branch 'master' into plugins
Conflicts:
	.travis.yml
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/command.h
	src/config/preferences.c
	src/config/preferences.h
	src/event/client_events.c
	src/plugins/api.c
	src/plugins/api.h
	src/plugins/c_api.c
	src/plugins/c_plugins.c
	src/plugins/callbacks.c
	src/plugins/callbacks.h
	src/plugins/plugins.c
	src/plugins/plugins.h
	src/plugins/profapi.c
	src/plugins/profapi.h
2016-02-24 00:07:18 +00:00
James Booth
ac91e7ef85 Added theme support to plugins 2016-02-21 23:58:13 +00:00
James Booth
1654f16a2f Return result from plugin calls
closes #739
2016-02-21 02:06:09 +00:00
James Booth
3705437a60 Removed plugin hook call for MUC history 2016-02-18 22:59:00 +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
a152d7fb8e Added cmd_help_autocomplete_add 2016-02-18 21:14:12 +00:00
James Booth
0654aa1151 Added plugin commands to /help autocompletion 2016-02-18 21:06:21 +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
2ac911618a Fix call to plugins_post_chat_message_send 2016-02-16 23:48:47 +00:00
James Booth
7945ef5277 Fix plugin command memleak 2016-02-15 00:09:51 +00:00
James Booth
bd928f0f29 Removed non c plugin code 2016-02-14 23:52:04 +00:00
James Booth
3dd5c3b2c3 Updated copyright 2016-02-14 23:12:01 +00:00
James Booth
631c4f7d1b Updated copyright 2016-02-14 23:08:50 +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
db88e6dd7b Merge branch 'master' into plugins
Conflicts:
	src/main.c
	src/ui/console.c
2016-02-14 22:58:49 +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
cab552ce89 Merge branch 'master' into plugins 2016-02-14 02:02:37 +00:00
James Booth
f887a35c0c Fixed memory deallocations 2016-02-14 01:59:53 +00:00
James Booth
d7b331874a Fix memory leaks 2016-02-14 01:49:57 +00:00
James Booth
7a19ee822b Fixed theme defaults memory release 2016-02-14 01:37:13 +00:00
James Booth
87e3530e22 Added missing prefs_free_string() 2016-02-14 01:34:34 +00:00
James Booth
3147914d02 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2016-02-13 23:24:46 +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
07edeabc1c Merge branch 'master' into plugins 2016-02-11 00:46:44 +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
6d518327a3 Fixed /role and /affiliation help 2016-02-07 19:32:23 +00:00
James Booth
8da5be1972 Merge branch 'master' into plugins 2016-02-07 01:16:24 +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
c54c494dbf Fix merge 2016-02-04 21:12:20 +00:00
James Booth
43a1b7b45f Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
	src/ui/chatwin.c
	src/ui/notifier.c
2016-02-04 21:08:19 +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
f8f9ad5197 Tidy prefs_do_chat_notify() 2016-02-04 00:35:10 +00:00
James Booth
8342265607 Removed unused arg: prefs_do_chat_notify() 2016-02-04 00:21:38 +00:00
James Booth
146ba50705 Merge branch 'master' into plugins 2016-02-03 23:40:51 +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
72c1c49695 Added console.chat preference 2016-02-03 23:02:52 +00:00
James Booth
003cdcf3fb Added /console chat autocompletion 2016-02-03 22:47:22 +00:00
James Booth
8b7120a97e Merge branch 'master' into plugins 2016-02-03 22:21:52 +00:00
James Booth
30116dd922 Update autocompleters on roster nick change/clear
fixes #720
2016-02-03 22:19:29 +00:00
James Booth
94be55b8e9 Merge branch 'master' into plugins 2016-02-03 00:37:26 +00:00
James Booth
46b27bcbd8 Fixed help formatting 2016-02-03 00:37:05 +00:00
James Booth
a6c90649d9 Merge branch 'master' into plugins 2016-02-03 00:15:44 +00:00
James Booth
77e819e81a Handle self leaving room in private wins 2016-02-03 00:11:38 +00:00
James Booth
4ddcd86f76 Merge branch 'master' into plugins
Conflicts:
	src/event/client_events.c
2016-02-02 23:32:42 +00:00
James Booth
292c9cf454 Handle occupant nick change in private wins 2016-02-02 23:25:26 +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
b831c4fcf7 Merge branch 'master' into plugins 2016-02-01 01:11:40 +00:00
James Booth
f91b21a1d6 Allow splitting roster rooms by conference server 2016-02-01 01:11:01 +00:00
James Booth
c2fdbe3076 Merge branch 'master' into plugins 2016-01-31 23:13:12 +00:00
James Booth
08c1e62e3c Colour private chats by presence in roster panel 2016-01-31 23:08:14 +00:00
James Booth
4997d92ffa Merge branch 'master' into plugins 2016-01-31 22:08:44 +00:00
James Booth
431913127c Roster panel colour fixes 2016-01-31 22:02:04 +00:00
James Booth
b3c7d6980e Merge branch 'master' into plugins 2016-01-31 20:29:07 +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
ff697fb2bb Merge branch 'master' into plugins 2016-01-31 02:48:13 +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
7c1970c6f6 Merge branch 'master' into plugins 2016-01-31 00:43:38 +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
baaa6184fd Merge branch 'master' into plugins 2016-01-30 20:39:51 +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
dbc52de043 Added /roster count command 2016-01-27 22:34:22 +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
97b2b12f23 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2016-01-25 00:34:03 +00:00
James Booth
45a1c66e87 Themes: Tidy foreground colour loading 2016-01-25 00:27:56 +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
50571b4975 Merge branch 'master' into plugins 2016-01-24 17:47:01 +00:00
James Booth
5ff36c14c0 Added roomtrigger colour theme
closes #717
2016-01-24 17:33:26 +00:00
James Booth
eb5b5c326d Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
	src/window_list.c
2016-01-24 03:00:12 +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
5f5c8122d0 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
2016-01-23 23:02:51 +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
72bbb5c2b9 Keep cache of default theme properties 2016-01-21 23:59:45 +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
81883c6a23 Merge branch 'master' into plugins 2016-01-20 01:49:15 +00:00
James Booth
5bccee93cc Added /roster show|hide contacts 2016-01-20 01:48:41 +00:00
James Booth
9b7f9b550a Merge branch 'master' into plugins 2016-01-19 22:59:40 +00:00
James Booth
10507b687b Added sys/select.h header includes 2016-01-19 22:55:43 +00:00
James Booth
98bf05b948 Merge branch 'master' into plugins 2016-01-19 22:38:39 +00:00
James Booth
519b10d105 Added /roster rooms position preference 2016-01-19 22:38:00 +00:00
James Booth
3b2b733d45 Merge branch 'master' into plugins 2016-01-17 21:22:33 +00:00
James Booth
7b982f383c Fixed theme load roster rooms unread setting 2016-01-17 21:20:00 +00:00
James Booth
aaaeec7220 Merge branch 'master' into plugins 2016-01-17 02:18:34 +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
964ded62d3 Merge branch 'master' into plugins 2016-01-15 00:47:28 +00:00
James Booth
aab6a52eee Show unread message count for contacts in roster 2016-01-15 00:44:47 +00:00
James Booth
1ec7bb4440 Merge branch 'master' into plugins 2016-01-14 22:55:05 +00:00
James Booth
fbc302317a Added roster contact themes 2016-01-14 22:54:50 +00:00
James Booth
9c881f5e93 Merge branch 'master' into plugins 2016-01-14 00:06:17 +00:00
James Booth
042ad4758f Fix compile error on Cygwin 2016-01-14 00:05:12 +00:00
James Booth
27d5079937 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
2016-01-13 23:19:57 +00:00
James Booth
2e99df1ac2 Added window title autocomplete to /close command 2016-01-13 23:19:11 +00:00
James Booth
7401d899ab Merge branch 'master' into plugins 2016-01-13 22:25:59 +00:00
James Booth
7938db0a25 Use offline presence for software version responses from non contacts
fixes #714
2016-01-13 22:25:29 +00:00
James Booth
06ca3cd28c Merge branch 'master' into plugins 2016-01-10 03:13:24 +00:00
James Booth
850ac3c6c0 Allow unlimited theme items 2016-01-10 03:11:05 +00:00
James Booth
35b92c2ce2 Merge branch 'master' into plugins 2016-01-09 22:34:11 +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
6c35d68074 Merge branch 'master' into plugins 2016-01-08 00:23:04 +00:00
James Booth
51f033ae42 End OTR sessions on lost server connection 2016-01-08 00:22:17 +00:00
James Booth
f22b8d8a20 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2016-01-08 00:14:24 +00:00
James Booth
a90e109f7e Destroy roster after updating UI in server disconnect 2016-01-08 00:13:12 +00:00
James Booth
634bbded2d Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
2016-01-07 00:40:49 +00:00
James Booth
e5447cf37b Added /win navigation by jid, win title 2016-01-07 00:38:17 +00:00
James Booth
c3d3737bc1 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
	src/profanity.c
2016-01-05 01:43:18 +00:00
James Booth
393e690165 Merge branch 'master' into roster-struct 2016-01-05 01:38:31 +00:00
James Booth
ba57b270db Merge branch 'master' into plugins
Conflicts:
	src/event/client_events.c
2016-01-05 01:32:16 +00:00
James Booth
e1e0fda8b3 Call UI disconnect functions before disconnecting with /disconnect
fixes #703
2016-01-05 01:30:32 +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
4b70f9e43f Merge branch 'master' into plugins
Conflicts:
	src/command/commands.c
	src/event/client_events.c
2016-01-03 17:26:48 +00:00
James Booth
8e9bf08389 Add cl_ev_disconnect 2016-01-03 17:23:36 +00:00
James Booth
eb832aed10 Merge branch 'master' into plugins
Conflicts:
	src/command/commands.c
2016-01-03 02:23:06 +00:00
James Booth
03f63a912e Close all windows on /disconnect 2016-01-03 02:20:17 +00:00
James Booth
a713654f93 Fixed compilation without libotr 2016-01-03 02:01:01 +00:00
James Booth
efd9681ae4 Merge branch 'master' into plugins 2016-01-03 01:34:29 +00:00
James Booth
4f35b11471 End OTR session when recipient goes offline 2016-01-03 01:32:37 +00:00
James Booth
9edae7fd0d Merge branch 'master' into plugins 2016-01-02 16:52:04 +00:00
James Booth
3d9e860574 Set autoping timeout default to 10 seconds, added null checks 2016-01-02 16:45:20 +00:00
James Booth
78f74a14ca Merge branch 'master' into plugins 2016-01-02 02:50:52 +00:00
James Booth
523c35c375 Fix roster rooms checks 2016-01-02 02:50:17 +00:00
James Booth
06cdf09bd0 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2016-01-02 02:42:47 +00:00
James Booth
8ca3fe4ea8 Sort roster rooms 2016-01-02 02:41:51 +00:00
James Booth
c9ac86805e Merge branch 'master' into plugins 2016-01-02 01:46:48 +00:00
James Booth
f9d89d564f Check for mucwin before showing room in roster 2016-01-02 01:45:02 +00:00
James Booth
fc92489be1 Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2016-01-02 01:39:24 +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
a8a76dbd6d Merge branch 'master' into plugins
Conflicts:
	src/xmpp/connection.c
2016-01-01 19:54:20 +00:00
James Booth
f27cae68c5 Added autoping timeout preference 2016-01-01 19:50:13 +00:00
James Booth
94b0d2c6da Added hardcoded autoping timeout 2015-12-31 01:48:04 +00:00
James Booth
af3f8a42b6 Merge branch 'master' into plugins 2015-12-31 00:40:23 +00:00
James Booth
08d30a4a83 Abort autping when existing attempt already in progress 2015-12-31 00:33:05 +00:00
James Booth
2847e39659 Tidy ping handlers 2015-12-31 00:11:58 +00:00
James Booth
a0c9b0cb70 Renamed autoping handler 2015-12-30 23:50:39 +00:00
James Booth
b48a9004dc Merge branch 'master' into plugins 2015-12-30 00:50:06 +00:00
James Booth
fb7001cffb Added console muc message setting to themes 2015-12-30 00:48:37 +00:00
James Booth
6e42f22bf3 Merge branch 'master' into plugins
Conflicts:
	src/command/commands.h
2015-12-30 00:36:53 +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
443ff426d0 Merge branch 'master' into plugins 2015-12-22 00:04:57 +00:00
Dmitry Podgorny
bea246d81b Don't compile pgp code with --disable-pgp 2015-12-21 12:53:41 +02:00
James Booth
5568a6a297 Merge branch 'master' into plugins 2015-12-20 23:28:18 +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
49f23c2f50 Merge branch 'master' into plugins 2015-12-20 03:15:20 +00:00
James Booth
e3471fbfaa Fixed /charset help 2015-12-20 03:15:00 +00:00