Commit Graph

299 Commits

Author SHA1 Message Date
slvr
5b6465528f handle_ping_response function signature correction 2013-08-10 19:55:54 +01: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
slvr
8f6f8e221d networking_poll: receivepacket(&ip_port, data, &length) == -1 2013-08-10 03:02:00 +01:00
irungentoo
341de59bb6 Fixed possible bug. 2013-08-09 20:32:51 -04:00
slvr
da01bafc83 core/substrate.h wasn't supposed to be here 2013-08-10 01:08:18 +01:00
slvr
75c2dd4cb9 fixed typo: handle_ping_request -> handle_ping_response 2013-08-10 01:03:30 +01: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
irungentoo
1ec95162a0 Merge pull request #413 from nurupo/master
Cleanup of Messenger.c
2013-08-09 16:24:39 -07: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
Christian Brueffer
0b9adb1f26 Kill EOF whitespace. 2013-08-09 20:46:17 +02:00
Christian Brueffer
0b8fa72914 Fix a recurring typo in code and comments. 2013-08-09 14:01:35 +02: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
irungentoo
cd22973d48 Merge pull request #396 from lukechampine/dynamicfriends
make friendlist resize dynamically
2013-08-08 08:50:06 -07:00
irungentoo
a3a0fb57cb Moved a define and fixed another. 2013-08-08 10:59:22 -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
stal
0e03b049d8 Reinstate semicolon 2013-08-07 22:58:39 -07:00
stal
67c2b9fffd Re-export m_callback_userstatus 2013-08-07 22:05:23 -07: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
eb546db56b Fix segfault when no broadcast device is found 2013-08-06 18:11:13 -06: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
irungentoo
39a213a58c Merge pull request #361 from plutooo/master
core: Moved handle ping packets to ping.c
2013-08-06 13:41:04 -07:00
plutooo
9e0ee5b7df core: Moved handle ping packets to ping.c 2013-08-06 13:09:14 -07:00
irungentoo
fc5a2f53df Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master
Conflicts:
	core/ping.c
	core/util.c
2013-08-06 13:53:38 -04:00
plutooo
6e610749eb core: Move ping request/response into ping.c 2013-08-06 09:42:53 -07:00
plutooo
e71413d8f1 core: Move send ping packets functions to ping.c 2013-08-06 09:21:39 -07:00
irungentoo
1daf064621 Merge branch 'plutooo-master' 2013-08-05 20:36:20 -04:00
irungentoo
524cf18954 Fixed style and is_pinging(). 2013-08-05 20:35:47 -04:00