[Commits] [SCM] claws branch, master, updated. 3.11.1-166-g89d3142
mones at claws-mail.org
mones at claws-mail.org
Wed Jun 24 01:54:57 CEST 2015
The branch, master has been updated
via 89d3142e639497bb25b8bd50add83b3dac100f70 (commit)
via 736a83b7994a37a4e2340e0382379fe015fe6349 (commit)
via ea9009a97c0cfc8232bcfe847fbd9f1473db800c (commit)
from a98ae440dcfee22016835e2ce703a308fdc6ae5e (commit)
Summary of changes:
src/plugins/address_keeper/address_keeper.c | 12 +++++-------
src/plugins/address_keeper/address_keeper.h | 6 ++----
src/plugins/address_keeper/address_keeper_prefs.c | 8 +++-----
src/plugins/address_keeper/address_keeper_prefs.h | 6 ++----
src/plugins/attachwarner/attachwarner.c | 6 ++----
src/plugins/attachwarner/attachwarner.h | 6 ++----
src/plugins/attachwarner/attachwarner_prefs.c | 8 +++-----
src/plugins/attachwarner/attachwarner_prefs.h | 6 ++----
src/plugins/libravatar/libravatar.c | 12 ++++++------
src/plugins/libravatar/libravatar_cache.c | 4 ++--
src/plugins/libravatar/libravatar_missing.c | 18 +++++++++---------
src/plugins/libravatar/libravatar_prefs.c | 2 +-
12 files changed, 39 insertions(+), 55 deletions(-)
- Log -----------------------------------------------------------------
commit 89d3142e639497bb25b8bd50add83b3dac100f70
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Jun 24 01:54:09 2015 +0200
AttachWarner: fix copyright and g_warning string
diff --git a/src/plugins/attachwarner/attachwarner.c b/src/plugins/attachwarner/attachwarner.c
index f5160dc..661b71a 100644
--- a/src/plugins/attachwarner/attachwarner.c
+++ b/src/plugins/attachwarner/attachwarner.c
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2006-2013 Ricardo Mones
+ * Copyright (C) 2006-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
diff --git a/src/plugins/attachwarner/attachwarner.h b/src/plugins/attachwarner/attachwarner.h
index e28be5d..eee9b9b 100644
--- a/src/plugins/attachwarner/attachwarner.h
+++ b/src/plugins/attachwarner/attachwarner.h
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2006-2012 Ricardo Mones
+ * Copyright (C) 2006-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 __ATTACHWARNER_H
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index cb144ba..c40d597 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_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) 2006-2015 Ricardo Mones
+ * Copyright (C) 2006-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
@@ -178,7 +176,7 @@ static void attwarner_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write AttachWarner configuration to file\n");
+ g_warning("failed to write AttachWarner configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/attachwarner/attachwarner_prefs.h b/src/plugins/attachwarner/attachwarner_prefs.h
index 0d5b27e..8ef0e9b 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.h
+++ b/src/plugins/attachwarner/attachwarner_prefs.h
@@ -1,7 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2006-2012 Ricardo Mones
+ * Copyright (C) 2006-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 __ATTACHWARNER_PREFS__
commit 736a83b7994a37a4e2340e0382379fe015fe6349
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Jun 24 01:53:12 2015 +0200
AddressKeeper: fix copyright and g_warning strings
diff --git a/src/plugins/address_keeper/address_keeper.c b/src/plugins/address_keeper/address_keeper.c
index aa6866a..d85d949 100644
--- 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
index 6db054a..abb93ec 100644
--- 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
index 1b7a77c..80ced56 100644
--- 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
index 9f1ea8c..fb0cd5a 100644
--- 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__
commit ea9009a97c0cfc8232bcfe847fbd9f1473db800c
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Jun 24 01:50:16 2015 +0200
Libravatar: fix g_warning strings
diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 4bdeb3b..f67d583 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -113,14 +113,14 @@ static GtkWidget *image_widget_from_filename(const gchar *filename)
picture = gdk_pixbuf_new_from_file(filename, &error);
if (error != NULL) {
- g_warning("Failed to load image '%s': %s\n", filename, error->message);
+ g_warning("failed to load image '%s': %s", filename, error->message);
g_error_free(error);
} else {
if (picture) {
image = gtk_image_new_from_pixbuf(picture);
g_object_unref(picture);
} else
- g_warning("Failed to load image '%s': no error returned!\n", filename);
+ g_warning("failed to load image '%s': no error returned!", filename);
}
return image;
@@ -155,7 +155,7 @@ static GtkWidget *image_widget_from_url(const gchar *url, const gchar *md5)
curl = curl_easy_init();
if (curl == NULL) {
- g_warning("could not initialize curl to get image from url\n");
+ g_warning("could not initialize curl to get image from URL");
return NULL;
}
curl_easy_setopt(curl, CURLOPT_URL, url);
@@ -194,13 +194,13 @@ static GtkWidget *image_widget_from_url(const gchar *url, const gchar *md5)
if (!libravatarprefs.cache_icons || filesize == 0) {
if (g_unlink(filename) < 0)
- g_warning("failed to delete cache file %s\n", filename);
+ g_warning("failed to delete cache file '%s'", filename);
}
if (filesize == 0)
missing_add_md5(libravatarmisses, md5);
} else {
- g_warning("could not open '%s' for writing\n", filename);
+ g_warning("could not open '%s' for writing", filename);
}
curl_easy_cleanup(curl);
g_free(filename);
@@ -254,7 +254,7 @@ static gchar *libravatar_url_for_md5(const gchar *base, const gchar *md5)
base, md5, AVATAR_SIZE);
}
- g_warning("invalid libravatar default mode: %d\n", libravatarprefs.default_mode);
+ g_warning("invalid libravatar default mode: %d", libravatarprefs.default_mode);
return NULL;
}
diff --git a/src/plugins/libravatar/libravatar_cache.c b/src/plugins/libravatar/libravatar_cache.c
index 321420c..3114ebb 100644
--- a/src/plugins/libravatar/libravatar_cache.c
+++ b/src/plugins/libravatar/libravatar_cache.c
@@ -29,7 +29,7 @@ gchar *libravatar_cache_init(const char *dirs[], gint start, gint end)
NULL);
if (!is_dir_exist(rootdir)) {
if (make_dir(rootdir) < 0) {
- g_warning("cannot create root directory %s\n", subdir);
+ g_warning("cannot create root directory '%s'", subdir);
g_free(rootdir);
return NULL;
}
@@ -38,7 +38,7 @@ gchar *libravatar_cache_init(const char *dirs[], gint start, gint end)
subdir = g_strconcat(rootdir, dirs[i], NULL);
if (!is_dir_exist(subdir)) {
if (make_dir(subdir) < 0) {
- g_warning("cannot create directory %s\n", subdir);
+ g_warning("cannot create directory '%s'", subdir);
g_free(subdir);
g_free(rootdir);
return NULL;
diff --git a/src/plugins/libravatar/libravatar_missing.c b/src/plugins/libravatar/libravatar_missing.c
index 238f6d3..c884899 100644
--- a/src/plugins/libravatar/libravatar_missing.c
+++ b/src/plugins/libravatar/libravatar_missing.c
@@ -43,12 +43,12 @@ GHashTable *missing_load_from_file(const gchar *filename)
if (!is_file_exist(filename)) { /* first run, return an empty table */
return g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
}
- g_warning("Cannot open %s for reading\n", filename);
+ g_warning("cannot open '%s' for reading", filename);
return NULL;
}
t = time(NULL);
if (t == (time_t)-1) {
- g_warning("Cannot get time!\n");
+ g_warning("cannot get time!");
goto close_exit;
}
@@ -58,7 +58,7 @@ GHashTable *missing_load_from_file(const gchar *filename)
if (t - (time_t)seen <= LIBRAVATAR_MISSING_TIME) {
time_t *value = g_malloc0(sizeof(time_t));
if (value == NULL) {
- g_warning("Cannot allocate memory\n");
+ g_warning("cannot allocate memory");
g_hash_table_destroy(table);
return NULL;
}
@@ -71,7 +71,7 @@ GHashTable *missing_load_from_file(const gchar *filename)
close_exit:
if (fclose(file) != 0)
- g_warning("Error closing %s\n", filename);
+ g_warning("error closing '%s'", filename);
debug_print("Read %d missing avatar entries, %d obsolete entries discarded\n", a, d);
return table;
@@ -89,7 +89,7 @@ static void missing_save_item(gpointer key, gpointer value, gpointer data)
FILE *file = (FILE *)data;
gchar *line = g_strdup_printf("%s %llu\n", (gchar *)key, *((long long unsigned *)value));
if (fputs(line, file) < 0)
- g_warning("Error saving missing item\n");
+ g_warning("error saving missing item");
g_free(line);
}
@@ -106,7 +106,7 @@ gint missing_save_to_file(GHashTable *table, const gchar *filename)
FILE *file = fopen(filename, "w");
if (file == NULL) {
- g_warning("Cannot open %s for writing\n", filename);
+ g_warning("cannot open '%s' for writing", filename);
return -1;
}
@@ -114,7 +114,7 @@ gint missing_save_to_file(GHashTable *table, const gchar *filename)
debug_print("Saved %u missing avatar entries\n", g_hash_table_size(table));
if (fclose(file) != 0) {
- g_warning("Error closing %s\n", filename);
+ g_warning("error closing '%s'", filename);
return -1;
}
@@ -133,7 +133,7 @@ void missing_add_md5(GHashTable *table, const gchar *md5)
time_t t = time(NULL);
if (t == (time_t)-1) {
- g_warning("Cannot get time!\n");
+ g_warning("cannot get time!");
return;
}
@@ -141,7 +141,7 @@ void missing_add_md5(GHashTable *table, const gchar *md5)
if (seen == NULL) {
seen = g_malloc0(sizeof(time_t));
if (seen == NULL) {
- g_warning("Cannot allocate memory\n");
+ g_warning("cannot allocate memory");
return;
}
*seen = t;
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index edf08ce..794a7df 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -388,7 +388,7 @@ static void libravatar_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write Libravatar configuration to file\n");
+ g_warning("failed to write Libravatar configuration to file");
prefs_file_close_revert(pfile);
return;
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list