StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
3,237 Commits 2 Branches 1 Tag 69 MiB
5b7cbc8956
Commit Graph

609 Commits

Author SHA1 Message Date
irungentoo
00c9c8ab57 More stuff done in group chats. 2013-09-09 13:52:03 -04:00
Coren[m]
29d777ef67 network.h: 
- IP: add in_addr_t as part of the union
- IP: rename IP to IP4
 2013-09-09 14:16:40 +02:00
irungentoo
0d41d7f9c0 Messaging now works in group chats. 2013-09-08 20:48:52 -04:00
Jin^eLD
e092eee869 Allow to build vs nacl instead of libsodium 
By default libsodium is used. Only if --enable-nacl is specified, then
nacl will be used instead of libsodium.

Pass locations of nacl headers and libraries by using the following
options:

--with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/
--with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/
 2013-09-06 22:54:45 +03:00
irungentoo
cc8a536cb0 Base of group chats seems to be working now. 2013-09-05 17:00:41 -04:00
irungentoo
c59975dd7e Work in progress group chats. 
Not done yet.
 2013-09-03 08:53:07 -04:00
jin-eld
4cb969344c Add forgoten source to the dist target 2013-09-01 21:44:26 +03:00
jin-eld
7d29bd23b9 Forward compatibility with automake 1.14 
This update makes sure that the build still works with automake prior to
1.12 and at the same time does not give any warnings or errors with
automake 1.14
 2013-09-01 20:39:02 +03:00
irungentoo
8f0bef5f20 Fixed warnings and moved hex_string_to_bin to testing/ 2013-08-30 08:16:34 -04:00
irungentoo
7441a234b7 Merge branch 'udp_connections' of https://github.com/vx-k/ProjectTox-Core into vx-k-udp_connections 2013-08-30 07:53:51 -04:00
Kostya
25563ac070 Fixed build errors. 2013-08-30 03:28:50 -04:00
Anony Moose
eb33796e58 Moved misc_tools from testing to toxcore. 2013-08-29 22:54:54 +00:00
irungentoo
059d2cfdb8 Use defines instead of numbers in DHT_test 2013-08-28 20:53:35 -04:00
Anony Moose
31354d80d4 Fixed another thing in loop; added initialization for tox_array in lossless UDP. 2013-08-28 22:04:34 +00:00
jin-eld
14a8ee4e0d Make nTox work on MinGW/Win32 2013-08-27 14:25:09 +03:00
Anony Moose
abaaef051c
Fixed several embarrassing errors and potential problems in tox_array. 2013-08-26 22:04:41 +00:00
Anony Moose
fefa2bdea0 connection_id can be negative, so it shouldn't be uint32_t. 2013-08-26 20:36:32 +00:00
Anony Moose
79f759049b
Trying to fix memory leak. 2013-08-26 20:16:09 +00:00
Anony Moose
76761a605b Modified Lossless_UDP connections to work with tox_array. 2013-08-25 17:55:54 +00:00
Anony Moose
9a7f7b5ec4 Added array for loop. 2013-08-24 21:45:45 +00:00
Anony Moose
ae3ab2efa4
Some more style changes 2013-08-24 20:54:03 +00:00
Anony Moose
39101b00a2
Fixed style in several macros. 2013-08-24 20:52:20 +00:00
Anony Moose
4326c4c8b5
Fixed semantics of tox_array (should also be more memory efficient). 2013-08-24 20:34:38 +00:00
jin-eld
1ec70337cf Remove cmake build system 2013-08-24 03:36:43 +03:00
jin-eld
50c8a820e5 Implemented autotools based build scripts 
supported options:

--with-dependency-search=DIR    will tell configure to look for various
dependencies in DIR/include and DIR/lib

Alternatively you can also specify libsodium header and libs location
with --with-libsodium-headers and --with-libsodium-libs if it is
installed elsewhere.

Ncurses and libconfig are handled via the default pkg-config way, see
./configure --help=short for detailed information.

The tox library is compiled as libtoxcore in shared and static variants,
public headers are installed to ${prefix}/include/tox

A pkg-config libtoxcore.pc configuration file is provided.

Use ./configure --help for a full list of configure options or
./configure --help=short for the options that I added.

To generate the configure script after pulling from git use:
autoreconf -i

To generate a release tarball use:
make dist

Unit tests are handled by the libcheck library integration that is provided
by autotools, use:
make check

to compile and run the tests.

Unit tests are currently optional, i.e. - if the check library is not
found on the system, then tests will be disabled. Same goes for nTox and
DHT bootstrap daemon - they will be enabled or disabled depending on the
availability of ncurses (for nTox) or libconfig (for DHT bootstrap
daemon).

The above can be also tuned by:
--enable-tests / --disable-tests
--enable-ntox / --disable-ntox
--enable-dht-bootstrap-daemon / --disable-dht-bootstrap-daemon
 2013-08-24 03:25:07 +03:00
jin-eld
e658892793 Rename core directory because of autoconf name clash 
While doing the checks configure might generate "core" files and will
then try to remove them. Having a "core" directory generates an error
while runing the configure script.

There's no workaround but to rename the core directory.
 2013-08-24 03:25:07 +03:00
irungentoo
0f77a2d131 Added tox_ to 2 typedefs. 2013-08-23 10:34:10 -04:00
irungentoo
9d3a8d94f2 New API done and tested. 
Some stuff needs to be cleaned a bit though.
 2013-08-23 10:26:52 -04:00
irungentoo
4d89d63c3f Removed useless and broken tests. 2013-08-23 06:40:30 -04:00
irungentoo
9eddeb0fd3 Merge pull request #517 from stqism/screw-nTox_win32 
Removed nTox_win32
 2013-08-23 03:35:06 -07:00
Sean Qureshi
97aef1442d Removed nTox_win32 2013-08-23 03:30:56 -07:00
jin-eld
c759967ad4 Remove toxic from core repository 
New location is:
https://github.com/Tox/toxic
 2013-08-23 11:31:38 +03:00
Manuel Argüelles
7ffa4017aa Make wide character support optional 
Issue #514. FindCursesw modified to make it simpler. Wide character
can be disable by passing NO_WIDECHAR=ON.
 2013-08-22 15:57:34 -05:00
irungentoo
7719a9ed58 init_cryptopacket is now called by new_DHT. 2013-08-22 13:19:38 -04:00
irungentoo
f249084772 Merge pull request #512 from manuel-arguelles/toxic_unicode 
Add wide char support in toxic (issue #440)
 2013-08-21 16:08:10 -07:00
Manuel Argüelles
d5e96fe670 Remove fix_name() function 
With unicode support this function is not longer valid.
 2013-08-21 16:24:33 -05:00
Manuel Argüelles
93789396b1 Add wide char support in toxic (issue #440) 
Set current locale, use of get_wch instead of getch for reading, use
wctomb and friends to convert back from wchar_t, link with
cursesw. Unicode support is only added to chat windows.
 2013-08-21 16:19:35 -05:00
Manuel Argüelles
d840e8a743 Add cmake module for ncursesw 
Default Curses module fails to detect the wide char version of curses
when both are installed. Current module should do better.
 2013-08-21 16:11:07 -05:00
Sanket Parmar
155823e7ce Fixed segfault and added support for single quotes in toxic 2013-08-21 23:27:34 +05:30
irungentoo
128223d9d1 astyle --options=tools/astylerc -r ./*.{c,h} 2013-08-20 19:37:05 -04:00
irungentoo
c7aafcfb4c Lossless UDP tests fixed. 2013-08-20 19:20:42 -04:00
Simon Levermann
6adbefab2b Use the messenger's dht instead of creating a new one 2013-08-20 23:08:14 +02:00
Simon Levermann
ffa01f8def Merge remote-tracking branch 'upstream/refactor' into refactor 2013-08-20 22:46:39 +02:00
irungentoo
1fde3ce6aa DHT_bootstrap fixed. 2013-08-20 16:37:34 -04:00
Simon Levermann
4f1dfa476a Fix Messenger_test 2013-08-20 22:36:22 +02:00
Simon Levermann
4ade191677 Remove timer test, fix CMake files to respect this change 2013-08-20 22:32:07 +02:00
irungentoo
747c290269 Fixed DHT_test.c and added some checks. 2013-08-20 15:53:15 -04:00
irungentoo
2f66b31244 nTox and cmake fixed. 2013-08-20 15:28:16 -04:00
irungentoo
ac621d96d3 Refactor of core done. 2013-08-20 14:47:32 -04:00
irungentoo
a1c40d753e More refactoring done. 2013-08-20 12:08:55 -04:00
Michael Rose
7f5591615d fixed space handling in commands (issue #495) 2013-08-20 13:40:15 +02:00
Jfreegman
22f766860f fix tab bar bugs 2013-08-19 16:59:24 -04:00
Jfreegman
2f4f81981d fix tab bar bugs 2013-08-19 16:55:04 -04:00
Michael Rose
0aabb5bc49 Merge with upstream 2013-08-19 14:40:15 +02:00
Michael Rose
d6ae8dce98 fix potential memory issue 2013-08-19 10:19:57 +02:00
Michael Rose
c2561cd67b fix define checks 2013-08-19 09:23:40 +02:00
irungentoo
b8bf05250c Merge pull request #491 from loadletter/master 
Store data and DHTservers in .config/tox
 2013-08-18 17:08:35 -07:00
Frederik Holden
29b61c574b Made configdir check XDG_CONFIG_HOME for config dir 2013-08-19 01:21:36 +02:00
loadletter
adac62560d Use configdir.c instead of hardcoded paths for the list of DHT servers. 2013-08-18 23:16:39 +02:00
Michael Rose
a3c985533c fix OS check in toxic 2013-08-18 21:12:54 +02:00
irungentoo
93104d1203 Fixed stack problem. 2013-08-18 11:59:34 -04:00
irungentoo
558a80f1c3 Merge branch 'tox-bugs' of https://github.com/stqism/ToxCore into stqism-tox-bugs 2013-08-18 10:19:35 -04:00
Sean Qureshi
af12267c77 Fixed toxic not running 2013-08-18 05:34:50 -07:00
Sean Qureshi
a5882f0433 No longer assumes Minix/BSD/AIX users actually use Macs when assigning a default name 2013-08-18 03:44:52 -07:00
Sean Qureshi
bdfd890aa8 Added mac support to the standardized data file, cleaned up a bit 2013-08-18 03:41:30 -07:00
Sean Qureshi
c3d90c6764 Added mac support with data, standarized data 2013-08-18 03:25:18 -07:00
Sean Qureshi
ab830825bd Added windows support to the standarized location 2013-08-18 03:12:55 -07:00
Sean Qureshi
1986e6b7f4 Ran it through astyle 2013-08-18 01:48:36 -07:00
Aaron Lipinski
146f6ac645 remove callback introduced temporarily during refactoring 2013-08-18 20:35:38 +12:00
Aaron Lipinski
a87804cf01 reduce number of windows, use consistent naming 2013-08-18 20:35:37 +12:00
Aaron Lipinski
1e4f9802fb remove WINDOW_STATUS, simplify adding and selecting chat windows 2013-08-18 20:26:39 +12:00
Sean Qureshi
c91e459364 Might improve windows detection 2013-08-17 20:57:35 -07:00
Sean Qureshi
ebe4a3f8d0 Added more colors 2013-08-17 19:43:10 -07:00
Sean Qureshi
91ae38450c Standarized DHTservers 2013-08-17 19:26:31 -07:00
Michael Rose
d1d24c123d Messenger stores / loads nickname 
new toxic command to show nickname (mynick)
 2013-08-17 11:59:28 +02:00
irungentoo
88ff81d9de Passed everything through astyle. 2013-08-16 13:11:09 -04:00
irungentoo
b15230583c Fixed loading and a small problem with the length of crypto requests. 2013-08-15 20:56:22 -04:00
irungentoo
36cb9b003d Merge branch 'master' of https://github.com/rose-m/ProjectTox-Core into rose-m-master 2013-08-15 19:59:43 -04:00
Maxim Biro
d93b5e2cb8 Fixed function agruments according to new API 2013-08-15 19:45:03 -04:00
Maxim Biro
bc15b106a9 Commented out nTox_win32 2013-08-15 19:12:55 -04:00
irungentoo
575804d19f Small improvement to DHT. Useless file removed. Small fix to toxic. 2013-08-15 14:24:32 -04:00
Michael Rose
76bfefff6f Merge fix 2013-08-15 12:11:48 +02:00
Aaron Lipinski
bf6c04b2ca add dhtstatus window 2013-08-15 12:02:57 +12:00
Aaron Lipinski
1e190c97b8 add dhtstatus file 2013-08-15 12:02:57 +12:00
Aaron Lipinski
e9f15d3879 refresh windows after resize 2013-08-15 12:02:56 +12:00
irungentoo
26a01e92ec Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-14 18:26:17 -04:00
irungentoo
4330bfbf87 Metadata collection prevention part 1 of ???. 
Crypto requests packets are packets that can be routed by nodes in the
DHT. In this pull request I have merged both Natping requests and friend
requests into one common packet (Crypto request packets). Both these
packets should now only be distinguishable by the size of the data in
them to an outside observer for an example on how to send and recieve
data with these packets see: friend_requests.c

Note that these packets are prefixed with id 32 (friend request packets)
which means this change is compatible with the currently running DHT
bootstrap servers.

Also changed small thing in DHT_test.c
 2013-08-14 18:26:00 -04:00
Jfreegman
aa114d2778 small bug fixes 2013-08-14 16:02:21 -04:00
naxuroqa
1b2ac061ec Fix for another segfault/leak case when using -f arg 2013-08-14 19:21:36 +02:00
Manuel Argüelles
2196fb8bc8 Fix segfault when using -f in toxic 
Call strdup() to the data file argument string to avoid segmentation
fault when it is later freed.
 2013-08-14 10:40:26 -05:00
irungentoo
0e0785c822 Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr 2013-08-14 09:00:55 -04:00
irungentoo
4ddd91b580 Fixed small compile error on my end. 2013-08-14 08:56:29 -04:00
irungentoo
661adacddf Merge branch 'remove_externs' of https://github.com/krisl/ProjectTox-Core into pr 2013-08-14 08:51:52 -04:00
Aaron Lipinski
4946c809d7 remove temporary callbacks from refactoring 2013-08-15 00:36:31 +12:00
Aaron Lipinski
1edb7c1660 move windows functions to its own file 2013-08-15 00:36:30 +12:00
Aaron Lipinski
75ce48146a remove externs in favor of includes 2013-08-15 00:36:30 +12:00
Aaron Lipinski
3f37c5580d add header guard and includes to windows.h 2013-08-15 00:36:30 +12:00
irungentoo
9fb82fc3bf Merge branch 'master' of https://github.com/naxuroqa/ProjectTox-Core into pr 2013-08-14 08:35:43 -04:00
Aaron Lipinski
4e21ac0d57 prefer param over static 
Conflicts:
	testing/toxic/main.c
 2013-08-15 00:34:22 +12:00
Astonex
1260aee9e1 Update prompt.c 
Make id uppercase.
 2013-08-14 11:23:38 +01:00
Aaron Lipinski
3b42f489e4 Have toxic handle new no-spam values from friend request 2013-08-14 21:16:58 +12:00
naxuroqa
72ee99e848 rewrite of get_id function 2013-08-14 10:44:57 +02:00
irungentoo
f93e23e411 Updated some files. 2013-08-13 11:50:33 -04:00
irungentoo
97f449a2f1 Fixed spam problem. (I broke the API so this will not build) 
The friend address is what the byte string that you give away for people
to add you will be called.

1. Every friend address now contains a number set by the friend. This is
to prevent someone from randomly spamming people in the DHT with friend
requests and makes it so you need the person to actually give you the
address in some way to send the friend request. This number is expected
to be encrypted with the friend request. All requests that do not
contain this number will be rejected. This means the spammer can no
longer use the DHT to collect lists of valid addresses to spam. It also
enables users to quickly change the number in case a spammer gets hold
of the address and starts spamming it.

2. A 2 byte checksum will be added (not implemented yet) to prevent
people from accidentally adding random strings as friends. (NOTE that
this has nothing to do with the spam problem I just decided to add a
placeholder for it now.)
 2013-08-13 09:32:31 -04:00
irungentoo
8fe1dec5d6 Fixed merge problem and set better default names. 2013-08-13 07:39:04 -04:00
irungentoo
d0cd78fbea Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master 2013-08-13 07:20:36 -04:00
irungentoo
cb4f67b37a Merge pull request #441 from slvr/timer 
Timer Subsystem
 2013-08-13 04:14:01 -07:00
slvr
4bfeb2f483 timer_new -> new_timer and timer_delete -> delete_timer to avoid name conflict 2013-08-13 09:45:11 +01:00
Andreas Schneider
6b06431e9b core: Fix a possible buffer overflow using getself_name(). 
If the passed buffer is smaller than MAX_NAME_LENGTH then, you
will probably overflow it.
 2013-08-13 09:50:51 +02:00
Andreas Schneider
6b256ffdb4 toxic: Fix get_user_config_dir(). 2013-08-13 09:50:42 +02:00
Jfreegman
5c0da43d19 unresolved addresses fail silently 2013-08-12 22:34:08 -04:00
Jfreegman
0ac4f1fcb3 auto-connect errors verbose 2013-08-12 22:04:07 -04:00
Jfreegman
92029baff1 put a bunch of repeated code into a function and added timestamps to status/nick changes 2013-08-12 20:28:43 -04:00
Jfreegman
565a348ceb minor improvements and bug fixes 2013-08-12 19:50:50 -04:00
slvr
be840b46b9 Merge remote-tracking branch 'upstream/master' into timer 
Conflicts:
	core/Messenger.c
 2013-08-12 23:08:48 +01:00
irungentoo
f9bfb42504 Merge pull request #439 from Alek900/master 
Added support for userdata in callbacks
 2013-08-12 13:33:20 -07:00
irungentoo
107e4b8a5e Merge pull request #437 from JFreegman/master 
make connection more robust for toxic
 2013-08-12 08:13:33 -07:00
alek900
8d3e68b74d Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00
slvr
1a39c397c5 Implemented Deadline Timer and timer_test 2013-08-12 13:08:03 +01:00
Jfreegman
d87b79d368 a little overkill 2013-08-12 05:59:08 -04: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
Jfreegman
46209d958f make connection more robust 2013-08-12 03:10:47 -04:00
Maxim Biro
440871bda1 Fixed warnings on Windows 2013-08-11 14:17:02 -04:00
Simon Levermann
a34403e33b Fix a possible memory leak 2013-08-11 17:51:10 +02:00
irungentoo
c0d5fe9b5b Merge pull request #423 from JFreegman/master 
Auto-connect toxic to DHT on startup
 2013-08-11 07:40:07 -07:00
Jfreegman
2c2d608e29 potential seg fault 2013-08-11 00:55:09 -04:00
lukechampine
1139ca57a5 make argument handling (esp. of strings) more robust 2013-08-10 20:10:03 -04:00
irungentoo
8e05bcb5f9 Merge pull request #422 from slvr/crypto-speed-boost 
Cryptography speed boost
 2013-08-10 16:20:54 -07:00
Jfreegman
56df7e556e was making the ID change on every startup 2013-08-10 18:00:54 -04:00
Jfreegman
401cbeff37 fix memory leak 2013-08-10 16:28:40 -04:00
Jfreegman
216efc91a5 don't need that 2013-08-10 15:50:49 -04:00
Jfreegman
2694fc8d13 auto-connect to DHT on startup 2013-08-10 15:46:29 -04:00
slvr
acca5c8e8f Added crypto_speed_test 2013-08-10 18:06:51 +01:00
slvr
7f27fcaf37 tabs -> spaces 2013-08-10 11:27:36 +01:00
slvr
6052b1f119 network_registerhandler 2013-08-10 00:43:50 +01:00
Christian Brueffer
0b9adb1f26 Kill EOF whitespace. 2013-08-09 20:46:17 +02:00
irungentoo
44902d15a7 Merge pull request #409 from lukechampine/betterprompt 
make toxic handle input in a more sane manner
 2013-08-09 09:29:56 -07:00
Konstantin Kowalski
fa6fd7566b Added headers to fix build errors. 2013-08-09 15:54:14 +00:00
Konstantin Kowalski
4f2ecd20e9 Minor style changes. 2013-08-09 15:45:34 +00:00
Konstantin Kowalski
5f41c30d66 Moved long comments to wiki. 2013-08-09 15:44:22 +00:00
Konstantin Kowalski
1033d897ca Added arrays. 2013-08-09 15:38:21 +00:00
Konstantin Kowalski
fdb3e194ba Added INFO() debugging macro. 2013-08-09 15:35:19 +00:00
Luke Champine
b378a246a0 make toxic handle input in a more sane manner 2013-08-09 10:31:29 -04:00
irungentoo
8542b5bac8 Merge pull request #407 from JFreegman/master 
fixed chat window text wrapping in toxic
 2013-08-09 05:35:01 -07:00
Christian Brueffer
0b8fa72914 Fix a recurring typo in code and comments. 2013-08-09 14:01:35 +02:00
Jfreegman
9910115b4e fixed chat window text wrapping 2013-08-09 00:25:45 -04:00
Konstantin Kowalski
7bd9c8399c Fixed a printf argument. 2013-08-09 01:49:13 +00:00
irungentoo
ff25b59fa6 added -n argument to toxic to disable loading keys from file (for testing) 2013-08-08 18:50:29 -04: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
982c86df1f added /me actions to toxic 2013-08-08 15:01:33 -04:00
Astonex
54bacf49c9 Update nTox_win32.c 
Mispelled function name
 2013-08-08 19:39:29 +01:00
Simon Levermann
320c5a6708 Merge branch 'upstream' 2013-08-08 18:06:10 +02:00
Simon Levermann
caedd4489e Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into upstream 2013-08-08 18:05:41 +02:00
irungentoo
4542a6b829 Merge pull request #394 from Nominate/patch-2 
Updated chat.c to bring /status inline with prompt.c status command
 2013-08-08 08:27:19 -07:00
irungentoo
997a15d294 Merge pull request #393 from Nominate/patch-1 
Removed superfluous statusmsg
 2013-08-08 08:26:19 -07:00
irungentoo
a3a0fb57cb Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
Simon Levermann
b5f5b1a111 Cleanup and Error fixes 
Add several frees that were missing to prevent memory leaks
Replace strcpy with strdup where appropriate
Replace _stat with __stat64 for building on Windows
 2013-08-08 16:36:16 +02:00
Simon Levermann
97e178db3a Implement proper config directories. 2013-08-08 16:00:12 +02:00
irungentoo
7d7dd641f9 Merge pull request #384 from stqism/master 
Adds full -D support to toxics versioning, includes the commit number
 2013-08-08 06:34:42 -07:00
Nominate
fde09712db Updated chat.c to bring /status inline with prompt.c status command 2013-08-08 11:22:48 +01:00
Nominate
d9750569ac Removed superfluous statusmsg 
Users can just respecify their status with a message.  This will also encourage users to think about which status is actually appropriate instead of just leaving the status alone.
 2013-08-08 11:09:46 +01:00
Sean Qureshi
4d0cce2f69 Merge https://github.com/irungentoo/ProjectTox-Core 2013-08-08 03:07:41 -07:00
Sean Qureshi
1bbdd9d2db Merged upstream main.c changes 2013-08-08 03:04:36 -07:00
Jfreegman
0f2b4e5c77 oops 2013-08-08 04:55:22 -04:00
Jfreegman
6f98fc47b0 fix magic numbers 2013-08-08 04:51:58 -04:00
Simon Levermann
d7e2cca854 Attempt to get and create a proper directory for config storage. 2013-08-08 10:15:07 +02:00
Sean Qureshi
b3e02d9c9d Adds full -D support to toxics versioning, includes the commit number 2013-08-07 18:52:11 -07: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
81fccf68d6 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-07 18:23:26 -04:00
irungentoo
00ecb05c1b Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests 
Conflicts:
	testing/toxic/prompt.c
 2013-08-07 18:20:36 -04:00
Maxim Biro
b1a2af23e5 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
Sean Qureshi
3622a5c04c Manually merged prompt.c to upstream 2013-08-07 10:57:17 -07: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
Sean Qureshi
ece3407c55 Moved main.c to maaster 2013-08-07 10:36:32 -07:00
Robert Sutton
83112c588a Fix incompatible pointer type warning by changing type of print_statuschange to match parameter of userstatus callback. 2013-08-07 13:30:14 -04:00
Sebastian Stal
9f6262f3dd Check for correct error value in toxic. 2013-08-07 09:57:23 -07:00
Robert Sutton
a102fa7cb0 Add #undef before #define to fix redefinition warning 2013-08-07 12:54:42 -04:00
Sean Qureshi
2b916b96bd Fixed it not compiling 2013-08-07 09:35:37 -07:00
irungentoo
5a8da17e61 Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests 2013-08-07 09:11:51 -04:00
irungentoo
0c4788030f Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into pull-requests 2013-08-07 09:11:41 -04:00
irungentoo
e760c9eeff Merge pull request #360 from DarkSER/master 
fixed print_statuschange & m_set_userstatus usage in nTox_win32.c
 2013-08-07 06:07:44 -07:00
irungentoo
48d7d60a47 Merge pull request #370 from JFreegman/master 
Fixed two bugs
 2013-08-07 06:04:11 -07:00
Simon Levermann
924219b1ab Actually use write_result 2013-08-07 13:23:12 +02:00
Simon Levermann
6349ccc97b Don't ignore the result of fwrite. Since we're building with -Wall and -Werror, this causes compile failures. 2013-08-07 13:13:04 +02:00
Sergej
defabe8e0a set USERSTATUS_KIND_RETAIN as default 2013-08-07 09:43:05 +02:00
jin-eld
ba48234bfc Allow to set a specific userstatus type in toxic 
Use:
status <type> <message>, where type is one of
online
away
busy
offline

The message parameter is optional.

To set only the status message, as it was before, use:
statusmsg <message>
 2013-08-07 10:28:17 +03:00
Sean Qureshi
c02e1a095c Fixed flash killing beep 2013-08-07 00:26:21 -07:00
Sean Qureshi
ea969c6e42 Manually merged my earlier commits with upstream 2013-08-07 00:24:37 -07:00
Jfreegman
3f3be026b7 forgot this 2013-08-07 02:52:56 -04:00
Jfreegman
90524356a7 Fixed two bugs 2013-08-07 02:34:55 -04:00
ptrasd
caa75b52c3 testing/toxic/prompt.c: changed execute() to ignore whitespace at end of commands 2013-08-07 02:25:20 -04:00
ptrasd
b32a7b2294 testing/toxic/prompt.c: changed execute() to skip whitespace at start of command 2013-08-07 02:10:46 -04:00
Nick ODell
e18bbaf118 Merge remote-tracking branch 'upstream/master' 2013-08-06 18:13:58 -06:00
Nick ODell
34f531553a Fix bug where file handle wasn't closed on success 2013-08-06 18:11:13 -06:00
Konstantin Kowalski
f603342acf Added ERROR() and WARNING() for debugging. 2013-08-06 18:11:13 -06:00
Konstantin Kowalski
60f333328c Added a linked list implementation. 2013-08-06 18:11:12 -06:00
irungentoo
804216580d Merge pull request #363 from JFreegman/master 
code format/clean up
 2013-08-06 16:59:34 -07:00
Jfreegman
16b3ec746e code format/clean up 2013-08-06 18:27:51 -04:00
Konstantin Kowalski
3dfaa464ac Added ERROR() and WARNING() for debugging. 2013-08-06 16:47:15 -04:00
DarkSER
14413c4724 fixed print_statuschange & m_set_userstatus usage in nTox_win32.c 2013-08-06 22:06:17 +02:00