AddressKeeper: fix copyright and g_warning strings

[claws.git] / src / plugins / address_keeper / address_keeper.c

diff --git a/src/plugins/address_keeper/address_keeper.c b/src/plugins/address_keeper/address_keeper.c
index be4f05338deb4d82400b51d0b93fa5aa8f9d0bce..d85d949cc4cb28387e79b4a30817b5d31f91958c 100644 (file)
--- a/src/plugins/address_keeper/address_keeper.c
+++ b/src/plugins/address_keeper/address_keeper.c
@@ -1,7 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2009-2010 Ricardo Mones
+ * Copyright (C) 2009-2015 Ricardo Mones and the Claws Mail Team
  *
  * 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
@@ -14,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -95,7 +93,7 @@ gchar *get_comment_from_addr(const gchar *addr)
  *
  * @return TRUE if given address matches any of the patterns, FALSE otherwise.
  */
-gboolean matches_blocked_address(const gchar *addr, MatcherList *blocked)
+gboolean matches_blocked_address(gchar *addr, MatcherList *blocked)
 {
        if (blocked != NULL) {
                MsgInfo info;
@@ -135,7 +133,7 @@ void keep_if_unknown(AddressBookFile * abf, ItemFolder * folder, gchar *addr, Ma
                a_name = get_name_from_addr(addr);
                a_comment = get_comment_from_addr(addr);
                if (!addrbook_add_contact(abf, folder, a_name, clean_addr, a_comment)) {
-                       g_warning("contact could not be added\n");
+                       g_warning("contact could not be added");
                } else {
                        addressbook_refresh();
                }
@@ -182,11 +180,11 @@ static gboolean addrk_before_send_hook(gpointer source, gpointer data)
        }
 
        if (!addressbook_peek_folder_exists(keepto, &book, &folder)) {
-               g_warning("addressbook folder not found '%s'\n", keepto);
+               g_warning("addressbook folder not found '%s'", keepto);
                return FALSE;
        }
        if (!book) {
-               g_warning("addressbook_peek_folder_exists: NULL book\n");
+               g_warning("addressbook_peek_folder_exists: NULL book");
                return FALSE;
        }
        abf = book->rawDataSource;
@@ -197,7 +195,7 @@ static gboolean addrk_before_send_hook(gpointer source, gpointer data)
 
        if (addkeeperprefs.block_matching_addrs != NULL
                        && addkeeperprefs.block_matching_addrs[0] != '\0') {
-               blocked = matcherlist_new_from_lines(addkeeperprefs.block_matching_addrs, FALSE);
+               blocked = matcherlist_new_from_lines(addkeeperprefs.block_matching_addrs, FALSE, FALSE);
                if (blocked == NULL)
                        g_warning("couldn't allocate matcher");
        }