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
1d1bff14a2
Merge pull request #423 from JFreegman/master
...
Auto-connect toxic to DHT on startup
2013-08-11 07:40:07 -07:00
663f4eb4ff
potential seg fault
2013-08-11 00:55:09 -04:00
309de72829
make argument handling (esp. of strings) more robust
2013-08-10 20:10:03 -04:00
31a9a344d2
was making the ID change on every startup
2013-08-10 18:00:54 -04:00
35f7ba210d
fix memory leak
2013-08-10 16:28:40 -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
0314d11bf0
make toxic handle input in a more sane manner
2013-08-09 10:31: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
90b4f9b98c
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
ed10f009bd
Merge pull request #393 from Nominate/patch-1
...
Removed superfluous statusmsg
2013-08-08 08:26:19 -07: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
d6468d7d0c
Updated chat.c to bring /status inline with prompt.c status command
2013-08-08 11:22:48 +01:00
6a37d6e9f1
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
7475d4fea3
Merge https://github.com/irungentoo/ProjectTox-Core
2013-08-08 03:07:41 -07:00
4cf43ae097
Merged upstream main.c changes
2013-08-08 03:04:36 -07:00
757073a461
oops
2013-08-08 04:55:22 -04: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
94dab85275
Adds full -D support to toxics versioning, includes the commit number
2013-08-07 18:52:11 -07: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
8e881ca50f
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
174604a448
Modified clients to properly work with the changes
2013-08-07 18:12:59 -04:00
84847d8e29
Manually merged prompt.c to upstream
2013-08-07 10:57:17 -07:00
57601e0c1a
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
5411f62567
Moved main.c to maaster
2013-08-07 10:36:32 -07:00
660bfc1340
Check for correct error value in toxic.
2013-08-07 09:57:23 -07:00
9e5c88859a
Fixed it not compiling
2013-08-07 09:35:37 -07:00
088e7d3e17
Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests
2013-08-07 09:11:51 -04:00
605f84ac4a
Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into pull-requests
2013-08-07 09:11:41 -04:00
41238577e4
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
65694a06c4
Fixed flash killing beep
2013-08-07 00:26:21 -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
