1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-24 04:23:03 +01:00
Commit Graph

1266 Commits

Author SHA1 Message Date
JFreegman
454eb478dc Merge pull request #39 from FullName/ipv6.init_connection
Ipv6.init connection
2013-09-16 20:23:04 -07:00
Jfreegman
063bc7ca86 Merge branch 'ipv6.init_connection' of https://github.com/FullName/toxic into FullName-ipv6.init_connection 2013-09-16 23:10:29 -04:00
Coren[m]
560e6be66b Merge remote-tracking branch 'upstream/master' into ipv6.init_connection 2013-09-17 03:21:54 +02:00
Jfreegman
b6bf0eb0a0 fixes 2013-09-16 00:28:28 -04:00
Jfreegman
390cdc7b33 update makefile 2013-09-15 18:16:41 -04:00
Jfreegman
03f807f1cd merge 2013-09-15 17:17:21 -04:00
Jfreegman
399b92c8e7 added groupchats 2013-09-15 16:38:38 -04:00
Coren[m]
a0a6443820 Convert line on reading from file, not on using. 2013-09-15 14:31:59 +02:00
Sean
f5a6c8382e Merge pull request #38 from FullName/ipv6enabled
Adapted to ipv6-enabled tox
2013-09-15 02:46:59 -07:00
Coren[m]
f78bca7269 Adapted to ipv6-enabled tox
main.c:
- init_tox(): tox_new() => tox_new(TOX_ENABLE_IPV6_DEFAULT) (enables dual-stack per default)
- resolv_addr(): killed
- init_connection(): use tox_bootstrap_from_address(), which does the resolving

prompt.c:
- cmd_connect(): use tox_bootstrap_from_address(), which does the resolving
2013-09-15 09:22:23 +02:00
JFreegman
43f7847633 Merge pull request #37 from FullName/ServListOnGivenFilename
If the user gave a filename for the datafile, don't imply that they want to ignore the serverlist file.
2013-09-14 12:52:36 -07:00
Coren[m]
960bed12a8 If the user gave a filename for the datafile, don't imply that they want to ignore the serverlist file. 2013-09-14 11:21:38 +02:00
JFreegman
657b65dd19 Merge pull request #36 from JFreegman/master
Client specific max name length / status messages now dynamically resize
2013-09-13 17:15:06 -07:00
Jfreegman
170abde373 off by one error 2013-09-13 04:01:10 -04:00
Jfreegman
b7375fb2a1 made statusmessages resize dynamically according to window size 2013-09-13 02:02:49 -04:00
Jfreegman
863121273e added cmuch smaller client-specific maximum name length 2013-09-13 00:35:48 -04:00
Sean Qureshi
5308484d47 Merge pull request #34 from stqism/master
Merged pr6
2013-09-12 10:33:36 -07:00
Sean Qureshi
34fb7ba885 Manually merged changes by 1100110 2013-09-12 17:31:10 +00:00
Sean Qureshi
d06581fe1d Synced to master 2013-09-12 17:25:04 +00:00
Jfreegman
d4f365e28f Merge branch 'master' of https://github.com/Tox/toxic 2013-09-12 01:34:50 -04:00
Jfreegman
35cd2a2914 endwin needs to come first 2013-09-12 01:33:41 -04:00
JFreegman
be425be976 Merge pull request #33 from JFreegman/master
made error handling more consistent and added exit function
2013-09-11 20:16:22 -07:00
Jfreegman
c061895266 Unnecessary casting 2013-09-11 21:44:39 -04:00
Jfreegman
052f9f9936 more error handling 2013-09-11 18:07:26 -04:00
Jfreegman
f004a4ba82 added exit_toxic function (for real this time) 2013-09-11 00:12:03 -04:00
Jfreegman
40dcfc82d2 made error handling more consistent and added exit function 2013-09-11 00:02:27 -04:00
JFreegman
2e84836f8c Merge pull request #32 from FullName/Delta
if tox_new() fails, don't crash and leave the terminal in a broken state
2013-09-10 17:40:12 -07:00
JFreegman
0194e0377c Merge pull request #30 from JFreegman/master
truncate friends' notes if they're too long
2013-09-10 17:17:13 -07:00
Coren[m]
c9c9592685 if tox_new() fails, don't crash and leave the terminal in a broken state 2013-09-11 01:34:29 +02:00
Sean Qureshi
a8e73f1532 Needed for compile 2013-09-10 12:13:58 -07:00
Sean Qureshi
af537380a1 Removed file that may confuse people 2013-09-10 11:53:34 -07:00
Jfreegman
9e8fa92109 truncate friends' notes if they're too long 2013-09-10 04:04:13 -04:00
Jfreegman
f50f93ee81 move define 2013-09-09 15:33:15 -04:00
Jfreegman
4fc063d5fe api changed return on function 2013-09-09 06:54:36 -04:00
Jfreegman
1b5bcb4ffa tweaks and fixes 2013-09-09 01:08:06 -04:00
Jfreegman
fde8059a4c tweaks and fixes 2013-09-09 00:56:47 -04:00
Jfreegman
9798dd6b95 code cleanup/bug fixes 2013-09-08 03:18:34 -04:00
JFreegman
5b2e7bb7d2 Merge pull request #29 from JFreegman/master
Added status bar to prompt, made it beep/blink on friend request, and bug fixes
2013-09-07 11:28:42 -07:00
Jfreegman
08d87cc996 fix potential segfaul and added default friend request msg 2013-09-07 00:48:21 -04:00
Jfreegman
dd6a558a62 forgot to init 2013-09-06 21:39:22 -04:00
Jfreegman
9bf9dbe875 better way to check connection status 2013-09-06 21:37:16 -04:00
Jfreegman
261310b091 added status bar to prompt and fixed some bugs 2013-09-06 19:59:45 -04:00
JFreegman
333643d655 Merge pull request #28 from JFreegman/master
Added a statusbar to chat windows and removed spammy messages
2013-09-06 16:49:05 -07:00
Jfreegman
9c7cad0d55 made prompt window beep/blink on friend request 2013-09-06 02:51:10 -04:00
Jfreegman
ba7d01d3c1 bug fix and remove redundant code 2013-09-06 00:56:55 -04:00
Jfreegman
3ddae51998 small fix 2013-09-05 18:36:46 -04:00
Jfreegman
2040368dd9 changed version to 0.2.0 2013-09-05 18:26:03 -04:00
Jfreegman
05c7727fb8 Added a statusbar to chat windows and removed spammy messages 2013-09-05 18:24:58 -04:00
JFreegman
e51ad84b3c Merge pull request #26 from JFreegman/master
implemented status and connectionstatus callbacks
2013-09-05 15:17:32 -07:00
Jfreegman
369233ba04 remove superfluous prompt alerts and some visual changes 2013-09-05 01:34:23 -04:00