Simon Levermann
97e178db3a
Implement proper config directories.
2013-08-08 16:00:12 +02:00
Simon Levermann
d7e2cca854
Attempt to get and create a proper directory for config storage.
2013-08-08 10:15:07 +02: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
irungentoo
eacd12385f
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
Nominate
532f16a377
Fixed formatting
2013-08-06 11:50:10 +01:00
Nominate
fb9791bc69
Update prompt.c
2013-08-06 11:20:11 +01:00
Nominate
45c84e55e6
Corrected wrap-around
...
This should allow wrap-around and allow proper execution.
2013-08-06 11:16:17 +01:00
Nominate
1f001b2f91
Stops line-spamming and clears before printing help
...
This addresses one issue in #340 perfectly and slightly improves the other.
2013-08-06 08:10:05 +01:00
Sean Qureshi
56ac2af45b
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
2013-08-05 17:50:08 -07:00
Sean Qureshi
caee2c3fe5
Added flash, apparently in weird cases it works when beep fails
2013-08-05 17:47:49 -07:00
irungentoo
7aa45107be
Merge pull request #351 from joshuaj/toxic_flicker_fix
...
Fixed toxic friends list flicker
2013-08-05 17:37:10 -07:00
irungentoo
5d1657432a
Merge pull request #350 from stqism/master
...
Removed a useless ! from toxics status
2013-08-05 17:25:33 -07:00
irungentoo
109fe7bd0a
Merge pull request #341 from stal888/userstatus-ext
...
An extension to user statuses.
2013-08-05 17:24:04 -07:00
Sebastian Stal
37afc3c583
Windoze
2013-08-05 17:20:41 -07:00
Sean Qureshi
798504905b
Removed a useless ! from toxics status
2013-08-05 17:08:05 -07:00
Sean Qureshi
cb39cdbe5e
Throws in a bell when a message is recieved, to warn to user
2013-08-05 15:39:32 -07:00
Jfreegman
663764e046
spacing didn't match outgoing msgs
2013-08-05 18:38:55 -04:00
