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