Commit Graph

2112 Commits

Author SHA1 Message Date
irungentoo
07078f731f Merge pull request #817 from mannol1/master
Fixed cancel and added handling of the glare case
2014-03-23 18:09:05 -04:00
mannol
05ddf40f99 Remove header 2014-03-23 22:49:53 +01:00
mannol
6c76aacbbb Why do it even care 2014-03-23 22:48:12 +01:00
irungentoo
3b841b0860 Merge pull request #815 from jin-eld/nacl-fix-3
More NaCl related fixes
2014-03-23 10:30:41 -04:00
Jin^eLD
70475d281d Fix NaCl builds for *BSD
From what I see there is a difference between *BSD and Linux when
linking vs. toxcore which has been bulit vs. the NaCl library:

on Linux it only links if NaCl's object files (i.e. randombytes.o) is
present in the linker options, however on *BSD systems this will cause a
linking error, see:
https://github.com/Tox/toxic/issues/31#issuecomment-38224441

This commit makes sure that we do not add the NaCl object files to our
pkg-config settings on *BSD, but do add them on Linux.
2014-03-23 02:05:57 +01:00
Jin^eLD
ba4681ef1e Fix shared/static settings when building vs. NaCl library
Make sure the shared lib build is really disabled when compiling vs.
NaCl:

moved settings before libtool initialization
fixed parameter name
2014-03-23 02:05:34 +01:00
irungentoo
cb1c1d25ec
Some work on TCP server done. 2014-03-22 18:29:09 -04:00
mannol
88f286e607 Clare case fix
Wot fix
2014-03-22 19:42:05 +01:00
mannol
6b6dbc15e2 Well this seems to be working 2014-03-22 19:33:56 +01:00
irungentoo
04001b2ec3 Friends client id is now removed from the request received list when he is deleted. 2014-03-21 19:27:17 -04:00
irungentoo
d2d8965470 Fixed other api inconsistency. 2014-03-20 20:48:46 -04:00
irungentoo
2e48b31e47 Fixed an api inconsistency. 2014-03-20 20:32:37 -04:00
irungentoo
d013673366 A bit more code written for TCP servers. 2014-03-19 20:19:51 -04:00
irungentoo
91838f8c2d Fixed issue where other could send a bad userstatus. 2014-03-18 20:50:40 -04:00
irungentoo
f7beb70fe9 nTox fixes.
Added TOX_MAX_MESSAGE_LENGTH to tox.h
2014-03-18 20:45:03 -04:00
irungentoo
e2b235e296 Fixed warning. 2014-03-18 20:30:45 -04:00
irungentoo
5770a0e29a Merge branch 'api-fix'
Main changes:
1. Strings no longer need to be NULL terminated.
2. tox_get_friend_id is now named tox_get_friend_number.
3. The friend request callback function is now (Tox *tox, uint8_t *,
uint8_t *, uint16_t, void *), the Tox object pointer has been added to
it.
2014-03-18 20:02:50 -04:00
irungentoo
6f0f3632c0 Merge pull request #809 from jin-eld/fix-shared-lib-builds
Fix regression that disabled shared library builds
2014-03-18 09:23:05 -04:00
irungentoo
2e78c234ef Merge pull request #808 from jin-eld/fix-nacl-2
Tell pkg-config when tox core is built vs. nacl
2014-03-18 09:22:57 -04:00
Jin^eLD
63c50c8302 Fix regression that disabled shared library builds
My previous attempt that was supposed to disable shared library builds
with nacl had a side effect which basically disabled shared libs for all
configurations.

Eventhough AC_DISABLE_SHARED was used inside an if clause it seemed to
take over in any case.

I could not find a clean way around this, so had to override internal
libtool variables. Will check with the libtool people regarding a
cleaner implementation.
2014-03-18 11:35:28 +01:00
Jin^eLD
847cbdf8c2 Tell pkg-config when tox core is built vs. nacl
This is required so that applications using tox core do not fail to link when
core is built vs. the nacl library.
2014-03-18 01:57:48 +01:00
irungentoo
f85d5e512d Merge pull request #807 from jin-eld/fix-nacl-builds
Disabled shared lib when building vs. nacl library
2014-03-17 20:43:42 -04:00
Jin^eLD
8974ed8327 Disabled shared lib when building vs. nacl library 2014-03-18 01:39:54 +01:00
irungentoo
eefc709de5 Merge pull request #802 from JFreegman/master
add api function that gets the last time a friend was seen online (also ...
2014-03-17 20:22:36 -04:00
irungentoo
f9c9b263e0 Renamed toping to to_ping. 2014-03-16 13:57:21 -04:00
irungentoo
5babb281c0 Friend request callback now contains the Tox object. 2014-03-16 13:24:39 -04:00
Jfreegman
419a2fb2e3 retain old data file friendlists on load 2014-03-16 05:09:36 -04:00
Jfreegman
7d1060abc2 add api function that gets the last time a friend was seen online 2014-03-16 05:08:35 -04:00
irungentoo
e95494482f A bit of work done on the TCP relay server. 2014-03-15 22:11:36 -04:00
irungentoo
99d8300e1b Merge branch 'master' of https://github.com/mannol1/ProjectTox-Core into mouseym-patch-3 2014-03-14 21:12:05 -04:00
irungentoo
e143e5d7f6 Merge branch 'udp_test_fixes' of https://github.com/kc1212/ProjectTox-Core into mouseym-patch-3 2014-03-14 21:11:57 -04:00
mannol
6a63605501 Comment fix 2014-03-15 02:11:25 +01:00
mannol
e990f05817 Added new callback 2014-03-14 23:10:10 +01:00
David Lohle
5594b87d3c Add Qt-Gui 2014-03-14 17:24:49 -04:00
David Lohle
116467f659 Organize the Readme 2014-03-14 17:22:22 -04:00
irungentoo
3acf43b76a A bit of work done on the TCP relay server. 2014-03-14 14:12:35 -04:00
irungentoo
29afa26396 Slightly more work done on the TCP relay server. 2014-03-13 20:48:01 -04:00
irungentoo
cb9b8fc7cd Fixed bug, unconfirmed friends now load correctly. 2014-03-13 15:10:59 -04:00
irungentoo
2bb5e2c084 Started writing the code for the TCP relay server. 2014-03-12 20:47:07 -04:00
Kelong Cong
a13de8b105 updated compilation and execution instructions for Lossless UDP tests, and fixed minor typos 2014-03-12 21:40:52 +00:00
irungentoo
128a0d2444 Detailed docs for TCP server pretty much done.
Implementation coming soon.
2014-03-11 20:01:52 -04:00
irungentoo
500528a93f Merge pull request #798 from mannol1/master
Fixed segfault, timeout handling and logging.
2014-03-11 19:51:58 -04:00
mannol
dbc4314bda Invoke callback via invoke_callback func 2014-03-12 00:38:20 +01:00
mannol
9ba7cb7e76 Removed logging to stderr and fixed timeout handling 2014-03-12 00:22:49 +01:00
irungentoo
e364c64869 Merge pull request #796 from mannol1/master
Changed msi callbacks
2014-03-11 18:23:38 -04:00
mannol
54b1dafb0b Changed msi callbacks 2014-03-11 22:59:20 +01:00
irungentoo
6858d6387d Merge pull request #795 from mannol1/master
Added custom callback data and capability identifier
2014-03-10 19:49:29 -04:00
mannol
d1fbbae5e9 Added custom callback data and capability identifier 2014-03-11 00:36:47 +01:00
irungentoo
7b87975dec Merge pull request #792 from jin-eld/remove-libtoxav.pc
Remove libtoxav.pc from git
2014-03-10 08:49:09 -04:00
Jin^eLD
06613e3662 Remove libtoxav.pc from git
libtoxav.pc is automatically generated by configure from libtoxav.pc.in
and should not be commited.
2014-03-10 12:29:18 +01:00