Mercurial > hg
changeset 2134:fc7a758ebbde
Remove deprecated options comments, update headers
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 06 Jul 2014 10:00:20 +0200 |
parents | 69d00a118c0c |
children | 361603828d9e |
files | mcabber/mcabber/commands.c mcabber/mcabber/compl.c mcabber/mcabber/main.c mcabber/mcabber/utils.c mcabber/mcabber/xmpp.c mcabber/mcabber/xmpp_iqrequest.c mcabber/mcabber/xmpp_muc.c |
diffstat | 7 files changed, 9 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/mcabber/commands.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/commands.c Sun Jul 06 10:00:20 2014 +0200 @@ -1,7 +1,7 @@ /* * commands.c -- user commands handling * - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
--- a/mcabber/mcabber/compl.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/compl.c Sun Jul 06 10:00:20 2014 +0200 @@ -1,8 +1,8 @@ /* * compl.c -- Completion system * - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> - * Copyright (C) 2009-2012 Myhailo Danylenko <isbear@ukrpost.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2009-2014 Myhailo Danylenko <isbear@ukrpost.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
--- a/mcabber/mcabber/main.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/main.c Sun Jul 06 10:00:20 2014 +0200 @@ -1,7 +1,7 @@ /* * main.c * - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -397,21 +397,6 @@ scr_log_print(LPRINT_NORMAL, "Server: %s", p); if ((p = settings_opt_get("jid")) != NULL) { scr_log_print(LPRINT_NORMAL, "User JID: %s", p); - } else if (settings_opt_get("username")) { - /* TODO: remove after 0.10.2/3 */ - scr_log_print(LPRINT_NORMAL, "** ERROR: The JID is missing, but " - "the variable 'username' is defined in your " - "configuration file.\n" - "** Please update your configuration file and set " - "the 'jid' variable."); - } - - if (settings_opt_get("ssl_verify")) { // Deprecated option - /* TODO: remove after 0.10.2/3 */ - scr_log_print(LPRINT_NORMAL, - "** ERROR: The option ssl_verify is deprecated.\n" - "** Please update your configuration file and use " - "the 'ssl_ignore_checks' variable."); } }
--- a/mcabber/mcabber/utils.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/utils.c Sun Jul 06 10:00:20 2014 +0200 @@ -1,7 +1,7 @@ /* * utils.c -- Various utility functions * - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * Some of the ut_* functions are derived from Cabber debug/log code. * from_iso8601() comes from the Pidgin (libpurple) project. *
--- a/mcabber/mcabber/xmpp.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/xmpp.c Sun Jul 06 10:00:20 2014 +0200 @@ -1,8 +1,8 @@ /* * xmpp.c -- Jabber protocol handling * - * Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de> - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2008-2014 Frank Zschockelt <mcabber@freakysoft.de> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * Parts come from the centericq project: * Copyright (C) 2002-2005 by Konstantin Klyagin <konst@konst.org.ua> *
--- a/mcabber/mcabber/xmpp_iqrequest.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/xmpp_iqrequest.c Sun Jul 06 10:00:20 2014 +0200 @@ -2,7 +2,7 @@ * xmpp_iqrequest.c -- Jabber IQ request handling * * Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de> - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
--- a/mcabber/mcabber/xmpp_muc.c Tue Jun 24 20:58:46 2014 +0200 +++ b/mcabber/mcabber/xmpp_muc.c Sun Jul 06 10:00:20 2014 +0200 @@ -2,7 +2,7 @@ * xmpp_muc.c -- Jabber MUC protocol handling * * Copyright (C) 2008-2010 Frank Zschockelt <mcabber@freakysoft.de> - * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> + * Copyright (C) 2005-2014 Mikael Berthe <mikael@lilotux.net> * Copyright (C) 2010 Myhailo Danylenko <isbear@ukrpost.net> * * This program is free software; you can redistribute it and/or modify