Commit Graph

71 Commits

Author SHA1 Message Date
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
Astonex
f05aa30870 Merge remote-tracking branch 'ProjectTox/master' 2013-07-31 23:02:09 +01:00
Astonex
8dfba27242 Slight changes 2013-07-31 23:01:59 +01:00
irungentoo
1b4eea2186 Small fixes. 2013-07-30 19:38:05 -04:00
Astonex
cd0518a45c Update Messenger.c
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-31 00:13:31 +01:00
irungentoo
77fa38f597 Clarification. 2013-07-30 14:32:18 -04:00
irungentoo
87388b302e Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master
Also fixed his pull request.
2013-07-30 14:30:33 -04:00
Peter Maatman
12b19f6910 renamed getname to getfriendname and added a getname function to get the name of our client 2013-07-30 17:09:09 +02:00
Astonex
e920be4c01 Fixed the friends listing 2013-07-30 09:21:22 +01:00
irungentoo
deb124f539 Fixed name related functions.
They now should give proper lengths and take length into account when
sending.
2013-07-27 21:08:06 -04:00
irungentoo
14b43651c1 Ran the code through: astyle --style=linux 2013-07-27 08:43:36 -04:00
Konstantin Kowalski
241aca98bd A *lot* of style changes. 2013-07-26 23:07:25 -04:00
sometwo
db8d47dccb styling
haven't fixed switch statements because I'm lazy
2013-07-26 19:17:24 -03:00
irungentoo
3d1c77dc57 Added basic Local/LAN discovery. 2013-07-26 10:24:56 -04:00
SilentSand
59b34e423b Formatting.
Many stylistic changes, mostly formatting code more closely to the
coding style.
2013-07-26 04:02:17 -04:00
SilentSand
f377eb9ca2 Licensing
Added the GPLv3 license to some files in addition to fixing some
comments at the beginning of the files.
2013-07-25 21:45:56 -04:00
irungentoo
63375b68b6 Broadcast now enabled on socket. 2013-07-25 21:00:31 -04:00
Astonex
29aa702a4f Added simple init_networking() error checking 2013-07-24 00:32:50 +01:00
irungentoo
d0b4fa56a3 Friend requests should be better. 2013-07-22 17:02:32 -04:00
irungentoo
55361eac6f Modified the way friend requests worked.
Added routing of friend requests.
2013-07-22 14:52:42 -04:00
irungentoo
11e94066f7 Merge branch 'master' of https://github.com/sometwo/ProjectTox-Core into sometwo-master
Conflicts:
	core/Messenger.c
2013-07-20 07:55:21 -04:00
Maxim Biro
48e2a80720 Don't assume that all callbacks are set.
If one of callbacks is not set, the application crashes.
This is the case when you update the library and the update adds more
callbacks, or when you simply don't want to receive some of the updates
(callbacks).
In any case, defining all callbacks shouldn't be mandatory.
2013-07-19 23:17:15 -04:00
jvrv
a72777ed70 fix comments of some files 2013-07-20 00:00:10 -03:00
Martijnvdc
2b4712122c Update Messenger.c
changed all "i++" into "++i", as proposed by nfkd
2013-07-19 18:18:29 +02:00
irungentoo
f06cd56ece Saving of userstatus not implemented, removed loading of them. 2013-07-18 17:57:01 -04:00
irungentoo
dd623d120e Merge pull request #50 from stal888/master
Move packet IDs to Messenger.h.
2013-07-18 14:12:53 -07:00
irungentoo
6291a04ed2 Fixed bug in the messenger loading. 2013-07-18 17:10:26 -04:00
Sebastian Stal
0de611627d Move packet IDs to Messenger.h. 2013-07-18 13:58:03 -07:00
irungentoo
c8d7044efb Status packet is now id 49 (It's cleaner that way). 2013-07-18 15:59:14 -04:00