Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/main.c @ 2134:fc7a758ebbde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove deprecated options comments, update headers
author Mikael Berthe <mikael@lilotux.net>
date Sun, 06 Jul 2014 10:00:20 +0200
parents 9b4b7941647c
children 06669fc1810c
comparison
equal deleted inserted replaced
2133:69d00a118c0c 2134:fc7a758ebbde
1 /* 1 /*
2 * main.c 2 * main.c
3 * 3 *
4 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> 4 * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or (at 8 * the Free Software Foundation; either version 2 of the License, or (at
9 * your option) any later version. 9 * your option) any later version.
395 const char *p; 395 const char *p;
396 if ((p = settings_opt_get("server")) != NULL) 396 if ((p = settings_opt_get("server")) != NULL)
397 scr_log_print(LPRINT_NORMAL, "Server: %s", p); 397 scr_log_print(LPRINT_NORMAL, "Server: %s", p);
398 if ((p = settings_opt_get("jid")) != NULL) { 398 if ((p = settings_opt_get("jid")) != NULL) {
399 scr_log_print(LPRINT_NORMAL, "User JID: %s", p); 399 scr_log_print(LPRINT_NORMAL, "User JID: %s", p);
400 } else if (settings_opt_get("username")) {
401 /* TODO: remove after 0.10.2/3 */
402 scr_log_print(LPRINT_NORMAL, "** ERROR: The JID is missing, but "
403 "the variable 'username' is defined in your "
404 "configuration file.\n"
405 "** Please update your configuration file and set "
406 "the 'jid' variable.");
407 }
408
409 if (settings_opt_get("ssl_verify")) { // Deprecated option
410 /* TODO: remove after 0.10.2/3 */
411 scr_log_print(LPRINT_NORMAL,
412 "** ERROR: The option ssl_verify is deprecated.\n"
413 "** Please update your configuration file and use "
414 "the 'ssl_ignore_checks' variable.");
415 } 400 }
416 } 401 }
417 402
418 /* If no password is stored, we ask for it before entering 403 /* If no password is stored, we ask for it before entering
419 ncurses mode -- unless the username is unknown. */ 404 ncurses mode -- unless the username is unknown. */