1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 09:33:01 +01:00
Commit Graph

72 Commits

Author SHA1 Message Date
Sean Qureshi
e5dd681b28 Added windows support to the standarized location 2013-08-18 03:12:55 -07:00
Sean Qureshi
ccfff8b305 Ran it through astyle 2013-08-18 01:48:36 -07:00
Sean Qureshi
6196c1f4eb Might improve windows detection 2013-08-17 20:57:35 -07:00
Sean Qureshi
1a8dce7905 Added more colors 2013-08-17 19:43:10 -07:00
Sean Qureshi
374b7b9c6b Standarized DHTservers 2013-08-17 19:26:31 -07:00
irungentoo
9dce121a76 Passed everything through astyle. 2013-08-16 13:11:09 -04:00
irungentoo
9f9ca0a971 Fixed loading and a small problem with the length of crypto requests. 2013-08-15 20:56:22 -04:00
Michael Rose
399dd33b97 Merge fix 2013-08-15 12:11:48 +02:00
Aaron Lipinski
0ac97aa794 refresh windows after resize 2013-08-15 12:02:56 +12:00
Jfreegman
202d162d2e small bug fixes 2013-08-14 16:02:21 -04:00
naxuroqa
cab4d43889 Fix for another segfault/leak case when using -f arg 2013-08-14 19:21:36 +02:00
Manuel Argüelles
9cabdaa6a0 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
56210d46f9 Fixed small compile error on my end. 2013-08-14 08:56:29 -04:00
Aaron Lipinski
722d272128 move windows functions to its own file 2013-08-15 00:36:30 +12:00
Aaron Lipinski
2c81fd5e4b remove externs in favor of includes 2013-08-15 00:36:30 +12:00
Aaron Lipinski
5d07842d96 prefer param over static
Conflicts:
	testing/toxic/main.c
2013-08-15 00:34:22 +12:00
irungentoo
fcf556cd1b Fixed merge problem and set better default names. 2013-08-13 07:39:04 -04:00
Jfreegman
095b1b5db2 unresolved addresses fail silently 2013-08-12 22:34:08 -04:00
Jfreegman
0c6204ce82 auto-connect errors verbose 2013-08-12 22:04:07 -04:00
Jfreegman
24083b3082 minor improvements and bug fixes 2013-08-12 19:50:50 -04:00
irungentoo
b2f4e266d3 Merge pull request #439 from Alek900/master
Added support for userdata in callbacks
2013-08-12 13:33:20 -07:00
irungentoo
420858cb6f Merge pull request #437 from JFreegman/master
make connection more robust for toxic
2013-08-12 08:13:33 -07:00
alek900
3946277a07 Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00
Jfreegman
8162cfde0d a little overkill 2013-08-12 05:59:08 -04:00
Chris Hall
8687a54a87 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
a8d2ab1af0 make connection more robust 2013-08-12 03:10:47 -04:00
Simon Levermann
652f7aec26 Fix a possible memory leak 2013-08-11 17:51:10 +02:00
Jfreegman
663f4eb4ff potential seg fault 2013-08-11 00:55:09 -04:00
Jfreegman
31a9a344d2 was making the ID change on every startup 2013-08-10 18:00:54 -04:00
Jfreegman
d99e8c9926 don't need that 2013-08-10 15:50:49 -04:00
Jfreegman
7d0a56e6a6 auto-connect to DHT on startup 2013-08-10 15:46:29 -04:00
irungentoo
9237bbc0d7 Merge pull request #407 from JFreegman/master
fixed chat window text wrapping in toxic
2013-08-09 05:35:01 -07:00
Jfreegman
e40344186e fixed chat window text wrapping 2013-08-09 00:25:45 -04:00
irungentoo
7de004aea1 added -n argument to toxic to disable loading keys from file (for testing) 2013-08-08 18:50:29 -04:00
irungentoo
7501822535 Merge pull request #400 from JFreegman/master
Added actions/alternative type of messages
2013-08-08 12:40:15 -07:00
Jfreegman
30377630ee added /me actions to toxic 2013-08-08 15:01:33 -04:00
Simon Levermann
61d0d2dff0 Merge branch 'upstream' 2013-08-08 18:06:10 +02:00
Simon Levermann
e5c6e88ec0 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into upstream 2013-08-08 18:05:41 +02:00
irungentoo
0eff37e3d7 Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
Simon Levermann
a9ec08b998 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
c3c144ddd0 Implement proper config directories. 2013-08-08 16:00:12 +02:00
irungentoo
7bcff9eb99 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
Sean Qureshi
4cf43ae097 Merged upstream main.c changes 2013-08-08 03:04:36 -07:00
Jfreegman
297ee1ecaa fix magic numbers 2013-08-08 04:51:58 -04:00
Simon Levermann
c7463f0de2 Attempt to get and create a proper directory for config storage. 2013-08-08 10:15:07 +02:00
Maxim Biro
90acd2dfef 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
Maxim Biro
174604a448 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
Sean Qureshi
5411f62567 Moved main.c to maaster 2013-08-07 10:36:32 -07:00
Sean Qureshi
5614e73a17 Manually merged my earlier commits with upstream 2013-08-07 00:24:37 -07:00
Jfreegman
4cc4d3b755 forgot this 2013-08-07 02:52:56 -04:00