charmlesscoin
8649f86b10
removed script changes so _this_ build will pass
2013-08-07 18:30:16 -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
irungentoo
4dbcfdf05d
Some cosmetic improvements.
2013-08-07 18:14:35 -04:00
Maxim Biro
b1a2af23e5
Modified clients to properly work with the changes
2013-08-07 18:12:59 -04:00
Maxim Biro
9801eceaa4
Separated StatusMessage from UserStatus
2013-08-07 18:12:31 -04:00
charmlesscoin
e47790ce31
Fixed the -lCheck issue
2013-08-07 17:16:02 -04:00
charmlesscoin
d70b56c10b
Travis failed on wget, dummy commit...
2013-08-07 16:41:17 -04:00
charmlesscoin
d263824079
I suppose adding the FindCheck script would be nice
2013-08-07 16:26:07 -04:00
charmlesscoin
0f664f3122
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into auto_tests
2013-08-07 15:22:57 -04:00
irungentoo
dda22a0167
Merge pull request #377 from sodwalt/feature
...
Fixed warnings when compiling nTox_win32
2013-08-07 11:30:42 -07: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
c0828667e7
Document functions, and fix bug.
2013-08-07 10:06:07 -07: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
Sebastian Stal
105e2fa4a3
Add read receipts using packet ID 65.
2013-08-07 09:53:52 -07: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
irungentoo
6864e9c931
Merge pull request #374 from leeroy2098/master
...
Don't ignore the result of fwrite. Since we're building with -Wall and -...
2013-08-07 06:02:15 -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
charmlesscoin
64b05c0960
Cleanup test and work on .travis file
2013-08-07 04:04:16 -04: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
charmlesscoin
4b34ecf913
added files for unit tests
2013-08-07 00:18:27 -04:00
charmlesscoin
c644ccd287
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core
2013-08-06 20:58:42 -04:00
irungentoo
d04f2d0e51
Merge pull request #366 from nickodell/master
...
Misc bugfixes
2013-08-06 17:35:26 -07: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
Nick ODell
eb546db56b
Fix segfault when no broadcast device is found
2013-08-06 18:11:13 -06:00
Nick ODell
7ddeb2bf6d
Fix bug where we could run past the end of the friends list
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
irungentoo
ba520d1558
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
2013-08-06 17:26:23 -04:00
irungentoo
29773d97fc
Small bug fixed.
2013-08-06 17:25:32 -04:00
irungentoo
50d9e80c1d
Merge pull request #362 from KostyaKow/master
...
Added linked list and stuff for debugging.
2013-08-06 14:17:19 -07:00
