James Booth
|
2426a7fcfc
|
Use null check convention in otrlibv3.c
|
2015-05-04 22:55:04 +01:00 |
|
James Booth
|
a979d23e10
|
Use null check convention in otr.c
|
2015-05-04 22:52:48 +01:00 |
|
James Booth
|
4dc9033472
|
Use null check convention in server_events.c
|
2015-05-04 22:51:15 +01:00 |
|
James Booth
|
4ba33005d0
|
Use null check convention in theme.c
|
2015-05-04 22:33:55 +01:00 |
|
James Booth
|
b093b99c15
|
Use null check convention in preferences.c
|
2015-05-04 22:33:19 +01:00 |
|
James Booth
|
a293045d85
|
Use null check convention in accounts.c
|
2015-05-04 22:32:42 +01:00 |
|
James Booth
|
47549452f1
|
Use null check convention in account.c
|
2015-05-04 22:29:51 +01:00 |
|
James Booth
|
4acf853b1c
|
Use null check convention in commands.c
|
2015-05-04 22:23:59 +01:00 |
|
James Booth
|
2b3cc65b52
|
Use null check convention in command.c
|
2015-05-04 22:16:39 +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
|
65ea572dae
|
Merge branch 'master' into pgp
|
2015-05-04 21:31:22 +01:00 |
|
James Booth
|
a0c872edf8
|
Extracted carbons handling
|
2015-05-04 21:31:05 +01:00 |
|
James Booth
|
a5677206e9
|
Merge branch 'master' into pgp
|
2015-05-04 21:20:40 +01:00 |
|
James Booth
|
ac940c2c8a
|
Revert "Added carbons handler"
This reverts commit ff867e7f2b .
|
2015-05-04 21:18:53 +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 |
|
James Booth
|
3dace733d9
|
Merge branch 'master' into pgp
|
2015-05-04 01:10:30 +01:00 |
|
James Booth
|
b1dd1e2726
|
cl_ev_send_muc_msg takes ProfMucWin as arg
|
2015-05-04 01:06:12 +01:00 |
|
James Booth
|
bb2b5d20d5
|
Merge branch 'master' into pgp
|
2015-05-04 00:57:17 +01:00 |
|
James Booth
|
ef54ff305e
|
ui_outgoing_chat_msg now takes ProfChatWin as argument
|
2015-05-04 00:55:43 +01:00 |
|
James Booth
|
bab4da039a
|
Merge branch 'master' into pgp
|
2015-05-04 00:43:36 +01:00 |
|
James Booth
|
c3d2a7e937
|
Added roster list function to get display name for messages
|
2015-05-03 23:38:46 +01:00 |
|
James Booth
|
0f3bece9e2
|
Merge branch 'master' into pgp
|
2015-05-03 02:35:15 +01:00 |
|
James Booth
|
ff867e7f2b
|
Added carbons handler
|
2015-05-03 02:34:58 +01:00 |
|
James Booth
|
bec9b53f10
|
Merge branch 'master' into pgp
|
2015-05-03 02:04:21 +01:00 |
|
James Booth
|
4e1c2a4f64
|
Show resource in status bar
|
2015-05-03 02:04:04 +01:00 |
|
James Booth
|
f65c82e112
|
Merge branch 'master' into pgp
|
2015-05-03 01:48:32 +01:00 |
|
James Booth
|
f25f90b38b
|
Extracted receipt request processing in message.c
|
2015-05-03 01:48:12 +01:00 |
|
James Booth
|
d3f4347513
|
Merge branch 'master' into pgp
Conflicts:
src/xmpp/message.c
|
2015-05-03 01:30:14 +01:00 |
|
James Booth
|
530c060d2a
|
Extract private message hanlding in message.c
|
2015-05-03 01:25:33 +01:00 |
|
James Booth
|
79d21d4cd2
|
Merge branch 'master' into pgp
|
2015-05-03 00:35:47 +01:00 |
|
James Booth
|
236c854419
|
Tidy message.c
|
2015-05-03 00:35:31 +01:00 |
|
James Booth
|
03ef791401
|
Merge branch 'master' into pgp
|
2015-05-03 00:06:12 +01:00 |
|
James Booth
|
5a90e2862e
|
Extracted receipt received handler
|
2015-05-03 00:05:47 +01:00 |
|
James Booth
|
0bc4377ad7
|
Merge branch 'master' into pgp
|
2015-05-02 23:40:34 +01:00 |
|
James Booth
|
ddc64755a0
|
Tidy message.c
|
2015-05-02 23:40:14 +01:00 |
|
James Booth
|
8c72f0deb5
|
Merge branch 'master' into pgp
|
2015-05-02 23:24:50 +01:00 |
|
James Booth
|
be4ee40ed4
|
Pass ProfChatWin to otr_on_message_send
|
2015-05-02 23:23:12 +01:00 |
|
James Booth
|
cade9e7c4c
|
Merge branch 'master' into pgp
|
2015-05-01 00:55:58 +01:00 |
|
James Booth
|
0118178080
|
Removed server event delegation functions
|
2015-05-01 00:55:40 +01:00 |
|
James Booth
|
0bd642edf8
|
Merge branch 'master' into pgp
|
2015-04-30 23:38:28 +01:00 |
|
James Booth
|
e11e55e31a
|
Move current win check to event, removed next and prev win functions
|
2015-04-30 22:43:08 +01:00 |
|
James Booth
|
a3a4b6267b
|
Merge branch 'master' into pgp
|
2015-04-30 22:10:03 +01:00 |
|
James Booth
|
d68fb25dde
|
Removed ui_win_switch_num
|
2015-04-30 22:09:39 +01:00 |
|
James Booth
|
20555fcb36
|
Added assert to ui_switch_win
|
2015-04-30 21:27:44 +01:00 |
|
James Booth
|
7730674f45
|
Merge branch 'master' into pgp
|
2015-04-30 21:24:06 +01:00 |
|
James Booth
|
0a6b76d6d3
|
Removed some ui functions, inlined
|
2015-04-30 21:23:43 +01:00 |
|
James Booth
|
d5188a160e
|
Merge branch 'master' into pgp
|
2015-04-29 23:16:43 +01:00 |
|
James Booth
|
2e75e54460
|
Added ui_win_error_line()
|
2015-04-29 23:16:28 +01:00 |
|