Commit Graph

308 Commits

Author SHA1 Message Date
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
Konstantin Kowalski
543b129ba7 Added a linked list implementation. 2013-08-06 13:52:05 -04:00