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

310 Commits

Author SHA1 Message Date
James Booth
ef7c2bea5c Merge branch 'master' into plugins 2017-01-28 17:29:57 +00:00
James Booth
68a3daedb9 Update Copyright 2017-01-28 17:24:22 +00:00
James Booth
e6166c76ba Merge branch 'master' into plugins 2017-01-22 21:46:54 +00:00
James Booth
83385cdbc0 Add pre chat and room message blocking 2017-01-22 18:09:04 +00:00
James Booth
33eb5743a0 Merge branch 'master' into plugins 2017-01-16 00:25:20 +00:00
James Booth
0d0578b625 Fix compile 2017-01-16 00:07:17 +00:00
James Booth
b9f2266e90 Merge branch 'master' into plugins 2017-01-16 00:03:23 +00:00
James Booth
2b7894ccff Remove status from cl_ev_presence_send
fixes #888
2017-01-15 23:59:31 +00:00
James Booth
f08781ea08 Merge branch 'master' into plugins 2016-11-22 00:43:09 +00:00
James Booth
e043029a50 Allow clearing account resource
issue #880
2016-11-22 00:39:52 +00:00
James Booth
785f79adb3 Merge branch 'master' into plugins 2016-10-30 17:24:57 +00:00
James Booth
eac6b52e05 Fix typo 2016-10-29 13:06:50 +01:00
James Booth
a6c4017fb9 Merge branch 'master' into plugins 2016-10-15 22:21:51 +01:00
James Booth
8f1d3ab55c Add win_print 2016-10-15 18:29:02 +01:00
James Booth
864939b809 Use win_printf_line instead of win_println 2016-10-15 17:03:30 +01:00
James Booth
c225d24b42 Merge branch 'master' into plugins
Conflicts:
	.travis.yml
2016-09-03 23:11:42 +01:00
James Booth
f6e9ff5b9b Fix missing params 2016-09-03 22:53:32 +01:00
Dmitry Podgorny
6090f76f72 Add missed argument 2016-09-02 20:56:20 +03:00
James Booth
47a1a62009 Add sv_ev_bookmark_autojoin 2016-08-28 22:42:09 +01:00
James Booth
33a4800b17 Merge branch 'master' into plugins 2016-08-18 22:55:57 +01:00
James Booth
a978bb12bf Send receipt request only when receiver supports feature
issue #829
2016-08-18 22:53:23 +01:00
James Booth
2430cc88d1 Merge branch 'master' into plugins 2016-07-25 23:37:25 +01:00
James Booth
5f8ef3816c Free rooms list in sv_ev_login_account_success 2016-07-25 23:11:41 +01:00
James Booth
c6f1a87d1d Merge branch 'master' into plugins 2016-07-24 15:44:16 +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
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
9cff37352a Make header defines consistent 2016-07-24 14:51:39 +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
b4cd071bab Merge remote-tracking branch 'origin/master' into plugins 2016-07-24 01:20:59 +01:00
James Booth
e8fc80f5c1 Update GPL link in headers 2016-07-24 01:14:49 +01:00
James Booth
00175add0d Merge branch 'master' into plugins 2016-05-23 23:59:15 +01:00
James Booth
6559263b2f Option to bookmark room invites
issue #813
2016-05-23 23:53:44 +01:00
James Booth
808902b903 Merge branch 'master' into plugins 2016-05-11 22:23: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
3ea7cf882e Merge branch 'master' into plugins 2016-05-01 01:07: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
f5656138c6 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2016-04-26 23:43:58 +01:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02: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
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
James Booth
17175bb672 Merge branch 'master' into plugins
Conflicts:
	src/plugins/plugins.c
2016-03-31 21:16:19 +01:00