James Booth
|
487f5da17d
|
Merge branch 'master' into openpgp
|
2015-05-10 01:08:30 +01:00 |
|
James Booth
|
fd28ea9461
|
Merge branch 'master' into plugins
Conflicts:
src/ui/core.c
src/ui/notifier.c
|
2015-05-10 01:08:22 +01:00 |
|
James Booth
|
aaad3ff909
|
Moved logic to notify_message
|
2015-05-10 01:03:34 +01:00 |
|
James Booth
|
acd2d2309f
|
Moved pgp signature generation to cl_ev_presence_send
|
2015-05-08 00:07:21 +01:00 |
|
James Booth
|
0db7bcbdcd
|
Merge branch 'master' into openpgp
|
2015-05-07 23:23:45 +01:00 |
|
James Booth
|
ca729cbdf6
|
Merge branch 'master' into plugins
Conflicts:
src/xmpp/roster.c
|
2015-05-07 23:23:38 +01:00 |
|
James Booth
|
d853284f92
|
Added cl_ev_presence_send
|
2015-05-07 23:21:48 +01:00 |
|
James Booth
|
a2281dbccf
|
Merge branch 'master' into openpgp
|
2015-05-07 23:16:22 +01:00 |
|
James Booth
|
d0fd8a38b3
|
Merge branch 'master' into plugins
Conflicts:
src/xmpp/roster.c
|
2015-05-07 23:16:18 +01:00 |
|
James Booth
|
56cbce2ff3
|
Renamed presence_update -> presence_send
|
2015-05-07 23:12:49 +01:00 |
|
James Booth
|
b611d8fe57
|
Merge branch 'master' into plugins
Conflicts:
src/xmpp/roster.c
|
2015-05-07 22:57:45 +01:00 |
|
James Booth
|
beeadd6ae3
|
Merge branch 'master' into openpgp
|
2015-05-07 22:51:42 +01:00 |
|
James Booth
|
f69ccbf0cc
|
Tidied _roster_result_handler
|
2015-05-07 22:51:35 +01:00 |
|
James Booth
|
8ebc1d4ac1
|
Moved pgp signature verification to sv_ev_contact_online
|
2015-05-07 22:22:28 +01:00 |
|
James Booth
|
8673488368
|
Merge branch 'master' into openpgp
|
2015-05-07 22:06:02 +01:00 |
|
James Booth
|
c951139f85
|
Merge branch 'master' into plugins
|
2015-05-07 22:05:55 +01:00 |
|
James Booth
|
a2c6211732
|
Added ui_contact_online
|
2015-05-07 22:05:36 +01:00 |
|
James Booth
|
8c347de298
|
Merge branch 'master' into openpgp
|
2015-05-07 00:26:45 +01:00 |
|
James Booth
|
3ba3de24f5
|
Merge branch 'master' into plugins
|
2015-05-07 00:26:39 +01:00 |
|
James Booth
|
6fd9b179a0
|
Optimised occupant comparisons, create utf8 collate key once
|
2015-05-07 00:26:24 +01:00 |
|
James Booth
|
ca3f7412f5
|
Optimised contact comparisons, create utf8 collate key once
|
2015-05-07 00:16:22 +01:00 |
|
James Booth
|
6840f3b599
|
Merge branch 'master' into openpgp
|
2015-05-06 22:04:47 +01:00 |
|
James Booth
|
0cd33fff49
|
Merge branch 'master' into plugins
|
2015-05-06 22:04:30 +01:00 |
|
James Booth
|
5067e565e3
|
Set ui nonblocking on presence updates
Speeds up joining rooms, and connecting.
|
2015-05-06 22:02:50 +01:00 |
|
James Booth
|
c9e21a557e
|
Merge branch 'master' into openpgp
|
2015-05-05 00:51:16 +01:00 |
|
James Booth
|
ada0cd7084
|
Merge branch 'master' into plugins
|
2015-05-05 00:51:01 +01:00 |
|
James Booth
|
d52f86ef0f
|
Tidied form field autocompleters
|
2015-05-05 00:13:41 +01:00 |
|
James Booth
|
44aa2fd1bf
|
Use null check convention in gpg.c
|
2015-05-04 23:41:22 +01:00 |
|
James Booth
|
3fd9692aec
|
Merge branch 'master' into pgp
|
2015-05-04 23:40:58 +01:00 |
|
James Booth
|
f4bef91e57
|
Fixed remaining null check convention changes
|
2015-05-04 23:40:20 +01:00 |
|
James Booth
|
1aa06eea89
|
Use null check convention in ruby_api.c
|
2015-05-04 23:37:31 +01:00 |
|
James Booth
|
2a3f7dfc82
|
Use null check convention in python_plugins.c
|
2015-05-04 23:37:02 +01:00 |
|
James Booth
|
1d88563100
|
Use null check convention in python_api.c
|
2015-05-04 23:36:34 +01:00 |
|
James Booth
|
fee0ee13d3
|
Use null check convention in plugins.c
|
2015-05-04 23:36:00 +01:00 |
|
James Booth
|
c0b7eb32d1
|
Use null check convention in lua_api.c
|
2015-05-04 23:35:03 +01:00 |
|
James Booth
|
0a9bce85d6
|
Use null check convention in callbacks.c
|
2015-05-04 23:34:38 +01:00 |
|
James Booth
|
bed16acdd9
|
Use null check convention in autocompleters.c
|
2015-05-04 23:33:54 +01:00 |
|
James Booth
|
fdeba06151
|
Use null check convention in api.c
|
2015-05-04 23:33:25 +01:00 |
|
James Booth
|
f542bce53e
|
Merge branch 'master' into plugins
|
2015-05-04 23:31:29 +01:00 |
|
James Booth
|
6f3750c6aa
|
Use null check convention in roster_list.c
|
2015-05-04 23:31:05 +01:00 |
|
James Booth
|
59788752c7
|
Use null check convention in resource.c
|
2015-05-04 23:29:53 +01:00 |
|
James Booth
|
0930f0f688
|
Use null check convention in profanity.c
|
2015-05-04 23:29:24 +01:00 |
|
James Booth
|
41724218c0
|
Use null check convention in log.c
|
2015-05-04 23:28:34 +01:00 |
|
James Booth
|
4c78534be0
|
Use null check convention in jid.c
|
2015-05-04 23:27:41 +01:00 |
|
James Booth
|
1bfaa49fb3
|
Use null check convention in contact.c
|
2015-05-04 23:26:57 +01:00 |
|
James Booth
|
1d002e5bdc
|
Use null check convention in common.c
|
2015-05-04 23:26:08 +01:00 |
|
James Booth
|
49e450767d
|
Use null check convention in chat_session.c
|
2015-05-04 23:24:37 +01:00 |
|
James Booth
|
c487fe5f77
|
Use null check convention in stanza.c
|
2015-05-04 23:23:55 +01:00 |
|
James Booth
|
defa955ae0
|
Use null check convention in roster.c
|
2015-05-04 23:22:06 +01:00 |
|
James Booth
|
8e64323503
|
Use null check convention in presence.c
|
2015-05-04 23:21:06 +01:00 |
|