Commit Graph

618 Commits

Author SHA1 Message Date
charmlesscoin 0b6806d7f7 Removed memory leak, thanks to diath for spotting it. 2013-08-04 04:29:32 -04:00
Jfreegman 357c02ac22 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-04 02:40:57 -04:00
charmlesscoin b36bca295c fixed bug that would cause this to always exit 2013-08-03 21:59:17 -04:00
Tim Malte Gräfje 5817c2c888 fix for #288
nTox will now display a message if you try to accept a not yet received
or already accepted friend request
2013-08-04 01:46:54 +02:00
charmlesscoin 175a434de3 removed some magic numbers from line_eval() 2013-08-03 18:06:28 -04:00
charmlesscoin 6222e32848 added some better error checking for print_nickname() anr print_statuschange() 2013-08-03 18:02:09 -04:00
charmlesscoin 43f6608530 cleaned up load_key() and added more error checking 2013-08-03 17:57:44 -04:00
charmlesscoin a65715e811 fix for issue #306 2013-08-03 17:29:18 -04:00
Jfreegman c13de2d285 added command to clear prompt screen 2013-08-03 17:13:44 -04:00
irungentoo 09a6d2d351 Merge branch 'nTox' of https://github.com/CharmlessCoin/ProjectTox-Core into CharmlessCoin-nTox
Conflicts:
	testing/nTox.c
2013-08-03 16:46:58 -04:00
irungentoo 1ddd28f52b Merge pull request #276 from stqism/master
Adds timestamp to toxic, fixes issue #217
2013-08-03 13:33:27 -07:00
charmlesscoin 9b56e21f81 added a proper error message for messing up the -f flag 2013-08-03 16:12:02 -04:00
charmlesscoin d34e4a3408 added the -f flag for toxic 2013-08-03 15:12:02 -04:00
Sean Qureshi 54aebfd807 Removed an early break 2013-08-03 11:51:40 -07:00
Sean Qureshi 6209d103f4 Merge branch 'master' of https://github.com/stqism/ProjectTox-Core 2013-08-03 11:45:07 -07:00
Sean Qureshi e4d63c63c7 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-03 11:41:47 -07:00
NemDiggers a1c31557f2 People aren't that excited to send messages 2013-08-03 11:53:51 -04:00
Michael Kress 1ae2bfbb75 added seconds to time stamp in toxic 2013-08-03 16:26:23 +02:00
Michael Kress 2e476a06b6 Merge branch 'master' of github.com:m-kress/ProjectTox-Core 2013-08-03 16:18:01 +02:00
Astonex 8fac63f6df Changing status to offline when quitting wont overwrite last saved status 2013-08-03 15:12:22 +01:00
Michael Kress 28944151c7 fixed printing time stamp in toxic 2013-08-03 16:00:48 +02:00
Astonex da8996dbdd Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core 2013-08-03 14:57:42 +01:00
Astonex fcad4d0a5a nTox_win32 - Updated friends list display 2013-08-03 14:14:33 +01:00
irungentoo 8cb960e785 Merge pull request #281 from JFreegman/master
cursor done better, fixed for chat windows
2013-08-03 05:14:44 -07:00
irungentoo dc8e188f30 Merge pull request #287 from greato/master
Added break; Statement
2013-08-03 05:03:05 -07:00
Michael Kress d5493bb24f added backspace to nTox; removed trailing spaces 2013-08-03 13:27:52 +02:00
Sean Qureshi 86d7734efe Removed some useless code 2013-08-03 04:10:47 -07:00
Sean Qureshi 6cfdf68940 Merge branch 'master' of github.com:stqism/ProjectTox-Core 2013-08-03 04:00:13 -07:00
Sean Qureshi 52f1dcd9ff Fixed a segfault when recieving text 2013-08-03 03:59:27 -07:00
Astonex 892249eabb Merge remote-tracking branch 'ProjectTox/master' 2013-08-03 11:33:46 +01:00
Astonex c1a8bc52f6 Can only accept friend request when one is pending now 2013-08-03 11:32:58 +01:00
Sean Qureshi e9c330dc60 Merged a change from a pull request, added a break
Merged from https://github.com/greato/ProjectTox-Core
2013-08-03 01:52:13 -07:00
Sean Qureshi cef0c68bdc Merge https://github.com/greato/ProjectTox-Core 2013-08-03 01:46:01 -07:00
g dd6f44a2c7 Added break Statement 2013-08-03 15:59:46 +08:00
Sean Qureshi 97fbdea304 Merge https://github.com/JFreegman/ProjectTox-Core 2013-08-02 22:31:21 -07:00
charmlesscoin 9b6283c084 whoops, removed part of a string by accident. 2013-08-03 01:27:20 -04:00
charmlesscoin bb2ea0e5b4 Fixed the printing of a few strings, moved some code around. 2013-08-03 01:14:30 -04:00
charmlesscoin 6b8f12e33c added a getopt system, with -f and -h flags 2013-08-03 00:45:34 -04:00
Sean Qureshi 62bf320b6e Removed the seconds patch, it breaks things 2013-08-02 19:58:00 -07:00
Sean Qureshi 7dd63b45ca Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-02 19:55:44 -07:00
charmlesscoin b9e3bf1fa6 changed some formatting, fixed the removal of x and y 2013-08-02 22:34:45 -04:00
Jfreegman 8fa074db5e cursor done better, fixed for chat windows 2013-08-02 21:36:01 -04:00
charmlesscoin 3678b302db cleaned up print_friendlist(), it now prints a message if you have _no_ friends 2013-08-02 21:22:02 -04:00
Sean Qureshi d19b4b9db1 Moved PATCH.md to the toxic folder 2013-08-02 17:50:35 -07:00
Sean Qureshi 8bc8016291 By popular demand, I made a patch to add seconds to the timestamp 2013-08-02 17:44:30 -07:00
Sean Qureshi 9267ab2fca Fixed a bug with the minutes only being 1 character long when less than 10 2013-08-02 17:14:47 -07:00
charmlesscoin f906fd628f cleaned up my changes 2013-08-02 19:54:57 -04:00
charmlesscoin 809ee9af75 new_lines should use strncpy, and wrote get_id() to declutter code 2013-08-02 19:51:08 -04:00
Sean Qureshi 10feea4474 Adds timestamp to toxic, fixes issue #217 2013-08-02 16:44:32 -07:00
irungentoo f8f24ba48a Fixed crashes. 2013-08-02 16:56:53 -04:00