Merge branch 'master' of github.com:vysheng/tg

This commit is contained in:
V V 2015-10-14 12:38:22 +03:00
commit 186e6c007f
2 changed files with 8 additions and 2 deletions

View File

@ -109,7 +109,7 @@ int msg_num_mode;
int permanent_msg_id_mode; int permanent_msg_id_mode;
int permanent_peer_id_mode; int permanent_peer_id_mode;
int disable_colors; int disable_colors;
int alert_sound; extern int alert_sound;
extern int binlog_read; extern int binlog_read;
int safe_quit; int safe_quit;

8
main.c
View File

@ -117,6 +117,7 @@ int ipv6_enabled;
char *start_command; char *start_command;
int disable_link_preview; int disable_link_preview;
int enable_json; int enable_json;
int alert_sound;
int exit_code; int exit_code;
int permanent_msg_id_mode; int permanent_msg_id_mode;
int permanent_peer_id_mode; int permanent_peer_id_mode;
@ -461,6 +462,7 @@ void usage (void) {
printf (" --wait-dialog-list/-W send dialog_list query and wait for answer before reading input\n"); printf (" --wait-dialog-list/-W send dialog_list query and wait for answer before reading input\n");
printf (" --disable-colors/-C disable color output\n"); printf (" --disable-colors/-C disable color output\n");
printf (" --disable-readline/-R disable readline\n"); printf (" --disable-readline/-R disable readline\n");
printf (" --alert/-A enable bell notifications\n");
printf (" --daemonize/-d daemon mode\n"); printf (" --daemonize/-d daemon mode\n");
printf (" --logname/-L <log-name> log file name\n"); printf (" --logname/-L <log-name> log file name\n");
printf (" --username/-U <user-name> change uid after start\n"); printf (" --username/-U <user-name> change uid after start\n");
@ -615,6 +617,7 @@ void args_parse (int argc, char **argv) {
{"wait-dialog-list", no_argument, 0, 'W'}, {"wait-dialog-list", no_argument, 0, 'W'},
{"disable-colors", no_argument, 0, 'C'}, {"disable-colors", no_argument, 0, 'C'},
{"disable-readline", no_argument, 0, 'R'}, {"disable-readline", no_argument, 0, 'R'},
{"alert", no_argument, 0, 'A'},
{"daemonize", no_argument, 0, 'd'}, {"daemonize", no_argument, 0, 'd'},
{"logname", required_argument, 0, 'L'}, {"logname", required_argument, 0, 'L'},
{"username", required_argument, 0, 'U'}, {"username", required_argument, 0, 'U'},
@ -640,7 +643,7 @@ void args_parse (int argc, char **argv) {
int opt = 0; int opt = 0;
while ((opt = getopt_long (argc, argv, "u:hk:vNl:fEwWCRdL:DU:G:qP:S:e:I6b" while ((opt = getopt_long (argc, argv, "u:hk:vNl:fEwWCRAdL:DU:G:qP:S:e:I6b"
#ifdef HAVE_LIBCONFIG #ifdef HAVE_LIBCONFIG
"c:p:" "c:p:"
#else #else
@ -726,6 +729,9 @@ void args_parse (int argc, char **argv) {
case 'R': case 'R':
readline_disabled ++; readline_disabled ++;
break; break;
case 'A':
alert_sound = 1;
break;
case 'd': case 'd':
daemonize ++; daemonize ++;
break; break;