1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-04 19:56:45 +02:00

Merge upsteam/master

This commit is contained in:
mannol
2014-02-22 23:58:36 +01:00
parent eb2d6afa00
commit e775c51a06
8 changed files with 128 additions and 29 deletions

View File

@ -26,6 +26,7 @@
#define N_DEFAULT_WINS 2 /* number of permanent default windows */
#define CURS_Y_OFFSET 3 /* y-axis cursor offset for chat contexts */
#define CHATBOX_HEIGHT 4
#define KEY_IDENT_DIGITS 2 /* number of hex digits to display for the pub-key based identifier */
#define EXIT_SUCCESS 0
#define EXIT_FAILURE 1
@ -149,7 +150,6 @@ struct PromptBuf {
#define MAX_FILES 256
#define FILE_PIECE_SIZE 1024
#define TIMEOUT_FILESENDER 300
#define MAX_PIECES_SEND 100 /* Max number of pieces to send per file per call to do_file_senders() */
typedef struct {
FILE *file;