1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 03:26:45 +02:00
Commit Graph

58 Commits

Author SHA1 Message Date
2c81fd5e4b remove externs in favor of includes 2013-08-15 00:36:30 +12:00
5d07842d96 prefer param over static
Conflicts:
	testing/toxic/main.c
2013-08-15 00:34:22 +12:00
fcf556cd1b Fixed merge problem and set better default names. 2013-08-13 07:39:04 -04:00
095b1b5db2 unresolved addresses fail silently 2013-08-12 22:34:08 -04:00
0c6204ce82 auto-connect errors verbose 2013-08-12 22:04:07 -04:00
24083b3082 minor improvements and bug fixes 2013-08-12 19:50:50 -04:00
b2f4e266d3 Merge pull request #439 from Alek900/master
Added support for userdata in callbacks
2013-08-12 13:33:20 -07:00
420858cb6f Merge pull request #437 from JFreegman/master
make connection more robust for toxic
2013-08-12 08:13:33 -07:00
3946277a07 Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00
8162cfde0d a little overkill 2013-08-12 05:59:08 -04:00
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
a8d2ab1af0 make connection more robust 2013-08-12 03:10:47 -04:00
652f7aec26 Fix a possible memory leak 2013-08-11 17:51:10 +02:00
663f4eb4ff potential seg fault 2013-08-11 00:55:09 -04:00
31a9a344d2 was making the ID change on every startup 2013-08-10 18:00:54 -04:00
d99e8c9926 don't need that 2013-08-10 15:50:49 -04:00
7d0a56e6a6 auto-connect to DHT on startup 2013-08-10 15:46:29 -04:00
9237bbc0d7 Merge pull request #407 from JFreegman/master
fixed chat window text wrapping in toxic
2013-08-09 05:35:01 -07:00
e40344186e fixed chat window text wrapping 2013-08-09 00:25:45 -04:00
7de004aea1 added -n argument to toxic to disable loading keys from file (for testing) 2013-08-08 18:50:29 -04:00
7501822535 Merge pull request #400 from JFreegman/master
Added actions/alternative type of messages
2013-08-08 12:40:15 -07:00
30377630ee added /me actions to toxic 2013-08-08 15:01:33 -04:00
61d0d2dff0 Merge branch 'upstream' 2013-08-08 18:06:10 +02:00
e5c6e88ec0 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into upstream 2013-08-08 18:05:41 +02:00
0eff37e3d7 Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
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
c3c144ddd0 Implement proper config directories. 2013-08-08 16:00:12 +02:00
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
4cf43ae097 Merged upstream main.c changes 2013-08-08 03:04:36 -07:00
297ee1ecaa fix magic numbers 2013-08-08 04:51:58 -04:00
c7463f0de2 Attempt to get and create a proper directory for config storage. 2013-08-08 10:15:07 +02:00
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
174604a448 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
5411f62567 Moved main.c to maaster 2013-08-07 10:36:32 -07:00
5614e73a17 Manually merged my earlier commits with upstream 2013-08-07 00:24:37 -07:00
4cc4d3b755 forgot this 2013-08-07 02:52:56 -04:00
c6cbaf8d2e Fixed two bugs 2013-08-07 02:34:55 -04:00
5fd1a658bc code format/clean up 2013-08-06 18:27:51 -04:00
2fbe37f7cf Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
	testing/toxic/prompt.c
2013-08-06 10:16:26 -04:00
b984ea3356 Merge pull request #350 from stqism/master
Removed a useless ! from toxics status
2013-08-05 17:25:33 -07:00
7c6467168e Removed a useless ! from toxics status 2013-08-05 17:08:05 -07:00
6494a4070b chat window deleting and re-adding - it just werks 2013-08-05 16:04:06 -04:00
51598d626a Make test clients compatible with userstatus kinds
No features were added, just fixed callbacks.
2013-08-05 12:30:40 -07:00
f824373e6a init array 2013-08-05 02:48:59 -04:00
8ab8f6b834 test 2013-08-05 02:32:50 -04:00
765a722c90 added ability to close and reopen chat windows & other minor changes 2013-08-05 01:57:29 -04:00
805eb0195a Fixed 2 Null pointer derefrences in both nTox and toxic 2013-08-04 14:36:09 -07:00
3c43b27617 toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now. 2013-08-04 03:27:36 -07:00
68476fba64 added a proper error message for messing up the -f flag 2013-08-03 16:12:02 -04:00
25093fa76e added the -f flag for toxic 2013-08-03 15:12:02 -04:00