alek900
8d3e68b74d
Added support for userdata in callbacks
2013-08-12 14:23:46 +02:00
Chris Hall
4293c4b1e6
Messenger refactor - redid work from pull request 79
...
Moves static state out of Messenger.c and into a Messenger struct
Purely stylistic, no functional changes were made.
This commit also changed all the callers of Messenger as they now have
to pass an instance of the Messenger struct to messenger functions.
Also removed some uses of the 'static' keyword at the beginning of
function definitions when the function was already declared static, as
these caused gcc to whine.
2013-08-12 21:37:38 +12:00
alek900
ed3b036862
Send our current status and name to friend that just came online.
...
Our username and status might have changed while our friend was offline.
2013-08-11 23:10:12 +02:00
Maxim Biro
e427197580
Fixed a mistake
2013-08-11 16:56:02 -04:00
Maxim Biro
eaa7d3e0a0
Replaced friendstatus with connectionstatus
2013-08-11 14:57:47 -04:00
irungentoo
3a2d453165
Merge pull request #429 from dparnell/pristine
...
Fixed m_sendmessage to return the ID of the message sent
2013-08-11 06:59:26 -07:00
Daniel Parnell
6c0db66a01
Fixed m_sendmessage to return the ID of the message sent
2013-08-11 22:15:07 +10:00
alek900
851c52571f
m_addfriend triggerd m_callback_friendstatus with a friendid thats not returned yet from m_addfriend
2013-08-11 13:02:02 +02:00
slvr
da8ef89e9d
Merge remote-tracking branch 'upstream/master' into pr
2013-08-10 19:20:56 +01:00
slvr
7f27fcaf37
tabs -> spaces
2013-08-10 11:27:36 +01:00
irungentoo
341de59bb6
Fixed possible bug.
2013-08-09 20:32:51 -04:00
slvr
951dbc1258
Updated initMessenger
2013-08-10 00:54:43 +01:00
slvr
6052b1f119
network_registerhandler
2013-08-10 00:43:50 +01:00
Maxim Biro
f0786d1fcd
Returned the length check
2013-08-09 19:20:23 -04:00
Maxim Biro
0f8eea89fa
Introduced data pointer and data_length
2013-08-09 17:03:37 -04:00
Maxim Biro
9dd691d106
Changed the way statusmessage is allocated
2013-08-09 17:03:30 -04:00
Maxim Biro
c6d06ae6ee
Moved some checks around
2013-08-09 16:28:12 -04:00
Maxim Biro
19bbed475d
Extracted repeated code into a function
2013-08-09 16:17:56 -04:00
irungentoo
cd730b532a
Merge pull request #403 from jin-eld/fix-friend-status-callback
...
Fix typo in function name which results in missing symbol
2013-08-08 14:15:00 -07:00
jin-eld
24bebf57d0
Fix typo in function name which results in missing symbol
2013-08-09 00:03:14 +03:00
irungentoo
5024bab930
Merge pull request #400 from JFreegman/master
...
Added actions/alternative type of messages
2013-08-08 12:40:15 -07:00
Jfreegman
8719f46645
added actions/alternate messages
2013-08-08 15:00:30 -04:00
irungentoo
9634a23437
Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
...
Conflicts:
core/Messenger.c
2013-08-08 14:39:27 -04:00
Maxim Biro
04c974962c
Made name consistent with other 'on change' callbacks
2013-08-08 13:54:16 -04:00
Maxim Biro
23f55c101d
Fixed a silly code ordering mistake
2013-08-08 13:42:27 -04:00
irungentoo
1fb2085c67
Fixed dynamic memory allocation.
2013-08-08 12:13:29 -04:00
Luke Champine
815628b76a
make friendlist resize dynamically
2013-08-08 10:49:36 -04:00
Maxim Biro
f66b6ce50b
Made a callback for Friend.status change
2013-08-08 02:12:19 -04:00
Maxim Biro
4779561ea3
Refactored an expression
2013-08-07 20:24:06 -04:00
Maxim Biro
b6a3f2b403
Added length checks
2013-08-07 20:23:48 -04:00
Maxim Biro
f669b28a6c
Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
...
Conflicts:
core/Messenger.c
core/Messenger.h
2013-08-07 19:18:40 -04:00
irungentoo
4dbcfdf05d
Some cosmetic improvements.
2013-08-07 18:14:35 -04:00
Maxim Biro
9801eceaa4
Separated StatusMessage from UserStatus
2013-08-07 18:12:31 -04:00
irungentoo
59f873fd68
Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
...
Conflicts:
testing/toxic/chat.c
testing/toxic/prompt.c
2013-08-07 13:51:58 -04:00
Sebastian Stal
c0828667e7
Document functions, and fix bug.
2013-08-07 10:06:07 -07:00
Sebastian Stal
105e2fa4a3
Add read receipts using packet ID 65.
2013-08-07 09:53:52 -07:00
Jfreegman
90524356a7
Fixed two bugs
2013-08-07 02:34:55 -04:00
Nick ODell
7ddeb2bf6d
Fix bug where we could run past the end of the friends list
2013-08-06 18:11:13 -06:00
irungentoo
29773d97fc
Small bug fixed.
2013-08-06 17:25:32 -04:00
Sebastian Stal
b7f989266d
Add functions for dealing with userstatus kinds.
2013-08-05 12:30:07 -07:00
Luke Champine
d1f84efdd7
temporary fix to prevent m_addfriend from segfaulting
2013-08-05 11:22:47 -04:00
Florian Hahn
5617bf0bf1
Use void for functions with no parameters
2013-08-05 15:57:17 +02:00
irungentoo
802236272f
Merge branch 'Jeffail-master'
2013-08-02 16:20:26 -04:00
irungentoo
7b46b04ce7
Time is better as an unsigned variable.
2013-08-02 15:57:53 -04:00
charmlesscoin
b114575df8
updated return value comments
2013-08-02 12:35:34 -04:00
charmlesscoin
4b49df896f
added #defines for friend.status as well as for erroring on m_addfriend*
2013-08-02 12:33:11 -04:00
charmlesscoin
6ed5b89e5b
removed getnumfriends()
2013-08-02 11:36:39 -04:00
Andreas Schneider
20951dda7d
DHT: Fix return value of time().
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 09:41:22 -04:00
Jfreegman
8abc0a3462
added error code for no message on friend add & updated nTox.c/nTox_win32.c
2013-08-01 15:27:08 -04:00
Jfreegman
d8867b95c5
corrected comment and removed forced message for friend adds
2013-07-31 21:42:28 -04:00
