commit 736a83b7994a37a4e2340e0382379fe015fe6349
parent ea9009a97c0cfc8232bcfe847fbd9f1473db800c
Author: Ricardo Mones <ricardo@mones.org>
Date: Wed, 24 Jun 2015 01:53:12 +0200
AddressKeeper: fix copyright and g_warning strings
Diffstat:
4 files changed, 12 insertions(+), 20 deletions(-)
diff --git 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
@@ -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;
diff --git a/src/plugins/address_keeper/address_keeper.h b/src/plugins/address_keeper/address_keeper.h
@@ -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/>.
*/
#ifndef __ADDRESS_KEEPER_H
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2009-2015 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
@@ -208,7 +206,7 @@ static void addkeeper_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write AddressKeeper configuration to file\n");
+ g_warning("failed to write AddressKeeper configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/address_keeper/address_keeper_prefs.h b/src/plugins/address_keeper/address_keeper_prefs.h
@@ -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/>.
*/
#ifndef __ADDRESS_KEEPER_PREFS__
