Mercurial > ~mikael > mcabber > hg
comparison mcabber/mcabber/main.c @ 1900:5dc0fd8225e3
Display a warning when the configuration file hasn't been updated
Display a message when the jid is missing and the 'username' option is
still set in the configuration file.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Wed, 14 Apr 2010 21:01:31 +0200 |
parents | efd7c4c34ff2 |
children | 84bb3e893586 |
comparison
equal
deleted
inserted
replaced
1899:decf94827efe | 1900:5dc0fd8225e3 |
---|---|
382 /* Display configuration settings */ | 382 /* Display configuration settings */ |
383 { | 383 { |
384 const char *p; | 384 const char *p; |
385 if ((p = settings_opt_get("server")) != NULL) | 385 if ((p = settings_opt_get("server")) != NULL) |
386 scr_log_print(LPRINT_NORMAL, "Server: %s", p); | 386 scr_log_print(LPRINT_NORMAL, "Server: %s", p); |
387 if ((p = settings_opt_get("jid")) != NULL) | 387 if ((p = settings_opt_get("jid")) != NULL) { |
388 scr_log_print(LPRINT_NORMAL, "User JID: %s", p); | 388 scr_log_print(LPRINT_NORMAL, "User JID: %s", p); |
389 } else if (settings_opt_get("username")) { | |
390 /* TODO: remove after 0.10.1/2 */ | |
391 scr_log_print(LPRINT_NORMAL, "** ERROR: The JID is missing, but " | |
392 "the variable 'username' is defined in your " | |
393 "configuration file.\n" | |
394 "** Please update your configuration file and set " | |
395 "the 'jid' variable."); | |
396 } | |
389 } | 397 } |
390 | 398 |
391 /* If no password is stored, we ask for it before entering | 399 /* If no password is stored, we ask for it before entering |
392 ncurses mode -- unless the username is unknown. */ | 400 ncurses mode -- unless the username is unknown. */ |
393 if (settings_opt_get("jid") && !settings_opt_get("password")) { | 401 if (settings_opt_get("jid") && !settings_opt_get("password")) { |