[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-115-ged74a4678
wwp at claws-mail.org
wwp at claws-mail.org
Fri Sep 3 15:10:33 UTC 2021
The branch, gtk3 has been updated
via ed74a4678f288382bf93c6dbe7cda08bcdacf40c (commit)
from d82adf835c4aa6da50f9c472c13ba359dcdfb865 (commit)
Summary of changes:
src/action.c | 2 +-
src/addr_compl.c | 2 +-
src/addressadd.c | 3 +-
src/addressbook-dbus.c | 24 ++---
src/addressbook.c | 2 +-
src/addrindex.c | 2 +-
src/avatars.c | 8 +-
src/common/Makefile.am | 1 +
src/common/file-utils.c | 12 +--
src/common/proxy.c | 2 +-
src/common/session.c | 18 ++--
src/common/socket.c | 4 +-
src/common/ssl.c | 2 +-
src/common/ssl_certificate.c | 2 +-
src/common/template.c | 4 +-
src/common/utils.c | 8 +-
src/common/xml.c | 18 ++--
src/compose.c | 25 +++--
src/etpan/Makefile.am | 1 +
src/export.c | 4 +-
src/folder.c | 8 +-
src/folderview.c | 2 +-
src/gtk/Makefile.am | 1 +
src/gtk/about.c | 2 +-
src/gtk/gtksctree.c | 2 +-
src/gtk/gtkunit.c | 6 +-
src/gtk/gtkutils.c | 4 +-
src/headerview.c | 2 +-
src/image_viewer.c | 6 +-
src/imap.c | 9 +-
src/import.c | 4 +-
src/main.c | 14 +--
src/mainwindow.c | 4 +-
src/mbox.c | 11 +-
src/messageview.c | 6 +-
src/mh.c | 8 +-
src/msgcache.c | 10 +-
src/partial_download.c | 2 +-
src/plugins/acpi_notifier/Makefile.am | 3 +-
src/plugins/acpi_notifier/acpi_notifier.c | 2 +-
src/plugins/address_keeper/Makefile.am | 3 +-
src/plugins/address_keeper/address_keeper_prefs.c | 2 +-
src/plugins/archive/archiver_prefs.c | 2 +-
src/plugins/archive/libarchive_archive.c | 4 +-
src/plugins/att_remover/Makefile.am | 3 +-
src/plugins/att_remover/att_remover.c | 2 +-
src/plugins/attachwarner/attachwarner_prefs.c | 2 +-
src/plugins/bogofilter/bogofilter.c | 4 +-
src/plugins/bsfilter/bsfilter.c | 4 +-
src/plugins/clamd/clamav_plugin.c | 8 +-
src/plugins/clamd/clamav_plugin_gtk.c | 2 +-
src/plugins/clamd/libclamd/clamd-plugin.c | 4 +-
src/plugins/demo/demo.c | 2 +-
src/plugins/dillo/dillo_prefs.c | 2 +-
src/plugins/fancy/fancy_prefs.c | 4 +-
src/plugins/gdata/gdata_plugin.c | 2 +-
.../litehtml_viewer/container_linux_images.cpp | 6 +-
src/plugins/litehtml_viewer/lh_viewer.c | 2 +-
src/plugins/litehtml_viewer/lh_widget.cpp | 2 +-
src/plugins/managesieve/managesieve.c | 2 +-
src/plugins/managesieve/sieve_editor.c | 4 +-
src/plugins/managesieve/sieve_prefs.c | 2 +-
.../gtkhotkey/gtk-hotkey-key-file-registry.c | 8 +-
.../gtkhotkey/gtk-hotkey-x11-listener.c | 2 +-
.../notification/gtkhotkey/x11/tomboykeybinder.c | 2 +-
.../notification/notification_foldercheck.c | 12 +--
src/plugins/notification/notification_prefs.c | 4 +-
src/plugins/pdf_viewer/poppler_viewer.c | 4 +-
src/plugins/perl/perl_gtk.c | 2 +-
src/plugins/perl/perl_plugin.c | 116 ++++++++++-----------
src/plugins/pgpcore/sgpgme.c | 2 +-
src/plugins/pgpinline/pgpinline.c | 2 +-
src/plugins/pgpmime/pgpmime.c | 2 +-
src/plugins/python/python_prefs.c | 2 +-
src/plugins/rssyl/parse822.c | 4 +-
src/plugins/rssyl/rssyl_add_item.c | 4 +-
src/plugins/rssyl/rssyl_deleted.c | 4 +-
src/plugins/rssyl/rssyl_prefs.c | 17 ++-
src/plugins/rssyl/rssyl_prefs.h | 2 +
src/plugins/rssyl/rssyl_update_feed.c | 9 +-
src/plugins/spam_report/spam_report.c | 2 +-
src/plugins/spam_report/spam_report_prefs.c | 2 +-
src/plugins/spamassassin/spamassassin.c | 4 +-
src/plugins/tnef_parse/tnef_parse.c | 2 +-
src/plugins/vcalendar/vcal_folder.c | 2 +-
src/plugins/vcalendar/vcal_manager.c | 8 +-
src/plugins/vcalendar/vcalendar.c | 2 +-
src/prefs_account.c | 6 +-
src/prefs_actions.c | 4 +-
src/prefs_folder_column.c | 2 +-
src/prefs_gtk.c | 34 +++---
src/prefs_summary_column.c | 2 +-
src/prefs_themes.c | 4 +-
src/procheader.c | 4 +-
src/procmime.c | 20 ++--
src/procmsg.c | 15 +--
src/quote_fmt_parse.y | 8 +-
src/setup.c | 2 +-
src/summaryview.c | 2 +-
src/textview.c | 4 +-
src/toolbar.c | 4 +-
src/wizard.c | 2 +-
102 files changed, 340 insertions(+), 311 deletions(-)
- Log -----------------------------------------------------------------
commit ed74a4678f288382bf93c6dbe7cda08bcdacf40c
Author: wwp <subscript at free.fr>
Date: Fri Sep 3 17:09:32 2021 +0200
Normalize g_warning's: no capitalization, no trailing punctuation or newline-char.
Fix few messages (simply wrong, or typos).
diff --git a/src/action.c b/src/action.c
index 7ea4434c3..411df0600 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1655,7 +1655,7 @@ static gchar *get_user_string(const gchar *action, ActionType type)
(_("Action's user argument"), message, NULL);
break;
default:
- g_warning("Unsupported action type %d", type);
+ g_warning("unsupported action type %d", type);
}
return user_str;
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 0d0bb9d97..fab34c345 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -392,7 +392,7 @@ static void read_address_book(gchar *folderpath) {
addrcompl_initialize();
if (! addrindex_dbus_load_completion(add_address, &error)) {
- g_warning("Failed to populate address completion list");
+ g_warning("failed to populate address completion list");
g_error_free(error);
return;
}
diff --git a/src/addressadd.c b/src/addressadd.c
index 403edabd2..d01581ca6 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -546,8 +546,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address,
ADDRITEM_ID(person), ".png", NULL );
gdk_pixbuf_save(picture, name, "png", &error, NULL);
if (error) {
- g_warning("Failed to save image: %s",
- error->message);
+ g_warning("failed to save image: %s", error->message);
g_error_free(error);
}
addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
diff --git a/src/addressbook-dbus.c b/src/addressbook-dbus.c
index 517f1e3e3..63bbe7761 100644
--- a/src/addressbook-dbus.c
+++ b/src/addressbook-dbus.c
@@ -64,7 +64,7 @@ static gboolean init(GError** error) {
if (connection == NULL || *error) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Unable to connect to dbus");
- g_warning("Unable to connect to dbus: %s", (*error)->message);
+ g_warning("unable to connect to dbus: %s", (*error)->message);
return FALSE;
}
@@ -73,7 +73,7 @@ static gboolean init(GError** error) {
"/org/clawsmail/contacts",
"org.clawsmail.Contacts");
if (proxy == NULL) {
- g_warning("Could not get a proxy object");
+ g_warning("could not get a proxy object");
g_set_error(error, client_object_error_quark(), 1, "Could not get a proxy object");
return FALSE;
}
@@ -125,7 +125,7 @@ static gchar* convert_2_utf8(gchar* locale) {
utf8 = g_convert(locale, -1, "UTF-8", current, &read, &write, &error);
if (error) {
- g_warning("Failed to convert [%s]: %s", charset, error->message);
+ g_warning("failed to convert [%s]: %s", charset, error->message);
g_free(current);
return NULL;
}
@@ -258,7 +258,7 @@ static DBusHandlerResult contact_add_signal(DBusConnection* bus,
}
else {
if (error.message) {
- g_warning("Reception error: %s", error.message);
+ g_warning("reception error: %s", error.message);
dbus_error_free(&error);
}
debug_print("Unhandled signal received\n");
@@ -278,7 +278,7 @@ gboolean addressbook_start_service(GError** error) {
if (!org_clawsmail_Contacts_ping(proxy, &reply, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
}
if (reply && strcmp("PONG", reply) == 0)
result = TRUE;
@@ -297,7 +297,7 @@ int addressbook_dbus_add_contact(ContactData* contact, GError** error) {
proxy, contact->book, dbus_contact.data, dbus_contact.emails, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
dbus_contact_free(&dbus_contact);
return -1;
}
@@ -322,7 +322,7 @@ gboolean addrindex_dbus_load_completion(gint (*callBackFunc)
proxy, "*", NULL, &list, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
g_strfreev(list);
return FALSE;
}
@@ -359,7 +359,7 @@ void addressbook_dbus_open(gboolean compose, GError** error) {
if (!org_clawsmail_Contacts_show_addressbook(proxy, compose, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
}
}
@@ -374,7 +374,7 @@ GSList* addressbook_dbus_get_books(GError** error) {
if (!org_clawsmail_Contacts_book_list(proxy, &book_names, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
g_strfreev(book_names);
return books;
}
@@ -416,7 +416,7 @@ void addressbook_connect_signals(Compose* compose) {
bus = dbus_bus_get (DBUS_BUS_SESSION, error);
if (!bus) {
- g_warning ("Failed to connect to the D-BUS daemon: %s", error->message);
+ g_warning("failed to connect to the D-BUS daemon: %s", error->message);
dbus_error_free(error);
return;
}
@@ -444,7 +444,7 @@ gchar* addressbook_get_vcard(const gchar* account, GError** error) {
if (!org_clawsmail_Contacts_get_vcard(proxy, account, &vcard, error)) {
if (! *error)
g_set_error(error, client_object_error_quark(), 1, "Woops remote method failed");
- g_warning ("Woops remote method failed: %s", (*error)->message);
+ g_warning("woops remote method failed: %s", (*error)->message);
g_free(vcard);
vcard = NULL;
}
@@ -477,7 +477,7 @@ static gboolean my_compose_create_hook(gpointer source, gpointer user_data) {
void addressbook_install_hooks(GError** error) {
if ((guint)-1 == hooks_register_hook(COMPOSE_CREATED_HOOKLIST, my_compose_create_hook, NULL)) {
- g_warning("Could not register hook for adding vCards");
+ g_warning("could not register hook for adding vCards");
if (error) {
g_set_error(error, client_object_error_quark(), 1,
"Could not register hook for adding vCards");
diff --git a/src/addressbook.c b/src/addressbook.c
index edfb8288b..a66c8030d 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -4263,7 +4263,7 @@ void addressbook_read_file( void ) {
if ( !is_dir_exist(indexdir) ) {
if ( make_dir(indexdir) < 0 ) {
addrindex_set_file_path( addrIndex, get_rc_dir() );
- g_warning( "couldn't create dir '%s'", indexdir);
+ g_warning("couldn't create dir '%s'", indexdir);
} else {
if (!migrate_addrbook(get_rc_dir(), indexdir)) {
remove_dir_recursive(indexdir);
diff --git a/src/addrindex.c b/src/addrindex.c
index 2b52c43d9..1517f02e8 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -2011,7 +2011,7 @@ static void addrindex_add_obj( XMLFile *file, AddressCvtNode *node ) {
node->list = g_list_append( node->list, newNode );
}
else {
- g_warning("Invalid tag");
+ g_warning("invalid tag");
}
}
}
diff --git a/src/avatars.c b/src/avatars.c
index 372f30b74..c39b1494c 100644
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -66,12 +66,12 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
}
if (avatarr == NULL) {
- g_warning("Internal rendering invoked with NULL argument");
+ g_warning("internal rendering invoked with NULL argument");
return FALSE;
}
if (avatarr->image != NULL) {
- g_warning("Memory leak: image widget not destroyed");
+ g_warning("memory leak: image widget not destroyed");
}
aface = procmsg_msginfo_get_avatar(avatarr->full_msginfo, AVATAR_FACE);
@@ -94,12 +94,12 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
void avatars_init(void)
{
if (avatar_render_hook_id != HOOK_NONE) {
- g_warning("Internal avatars rendering already initialized");
+ g_warning("internal avatars rendering already initialized");
return;
}
avatar_render_hook_id = hooks_register_hook(AVATAR_IMAGE_RENDER_HOOKLIST, avatars_internal_rendering_hook, NULL);
if (avatar_render_hook_id == HOOK_NONE) {
- g_warning("Failed to register avatars internal rendering hook");
+ g_warning("failed to register avatars internal rendering hook");
}
}
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b5a5759fb..59d00b582 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -92,6 +92,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/intl \
$(GLIB_CFLAGS) \
$(VALGRIND_CFLAGS) \
+ $(GNUTLS_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-DPLUGINDIR=\"$(PLUGINDIR)\" \
-DDATAROOTDIR=\""$(datarootdir)"\" \
diff --git a/src/common/file-utils.c b/src/common/file-utils.c
index d01502485..6995ce24c 100644
--- a/src/common/file-utils.c
+++ b/src/common/file-utils.c
@@ -133,7 +133,7 @@ int claws_unlink(const char *filename)
debug_print("%s %s exited with status %d\n",
args[0], filename, WEXITSTATUS(status));
if (truncate(filename, 0) < 0)
- g_warning("couln't truncate: %s", filename);
+ g_warning("couldn't truncate: %s", filename);
}
}
}
@@ -217,7 +217,7 @@ gint append_file(const gchar *src, const gchar *dest, gboolean keep_backup)
if (n_read < sizeof(buf) && claws_ferror(src_fp))
break;
if (claws_fwrite(buf, 1, n_read, dest_fp) < n_read) {
- g_warning("writing to %s failed.", dest);
+ g_warning("writing to %s failed", dest);
claws_fclose(dest_fp);
claws_fclose(src_fp);
claws_unlink(dest);
@@ -285,7 +285,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
if (n_read < sizeof(buf) && claws_ferror(src_fp))
break;
if (claws_fwrite(buf, 1, n_read, dest_fp) < n_read) {
- g_warning("writing to %s failed.", dest);
+ g_warning("writing to %s failed", dest);
claws_fclose(dest_fp);
claws_fclose(src_fp);
claws_unlink(dest);
@@ -329,7 +329,7 @@ gint copy_file(const gchar *src, const gchar *dest, gboolean keep_backup)
gint move_file(const gchar *src, const gchar *dest, gboolean overwrite)
{
if (overwrite == FALSE && is_file_exist(dest)) {
- g_warning("move_file(): file %s already exists.", dest);
+ g_warning("move_file(): file %s already exists", dest);
return -1;
}
@@ -405,7 +405,7 @@ gint copy_file_part(FILE *fp, off_t offset, size_t length, const gchar *dest)
}
if (err) {
- g_warning("writing to %s failed.", dest);
+ g_warning("writing to %s failed", dest);
claws_unlink(dest);
return -1;
}
@@ -463,7 +463,7 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
}
if (r == EOF) {
- g_warning("writing to %s failed.", dest);
+ g_warning("writing to %s failed", dest);
claws_fclose(dest_fp);
claws_fclose(src_fp);
claws_unlink(dest);
diff --git a/src/common/proxy.c b/src/common/proxy.c
index bffeb4165..a09379449 100644
--- a/src/common/proxy.c
+++ b/src/common/proxy.c
@@ -67,7 +67,7 @@ gint proxy_connect(SockInfo *sock, const gchar *hostname, gushort port,
} else if (proxy_info->proxy_type == PROXY_SOCKS4) {
return socks4_connect(sock, hostname, port);
} else {
- g_warning("proxy_connect: unknown SOCKS type: %d\n",
+ g_warning("proxy_connect: unknown SOCKS type: %d",
proxy_info->proxy_type);
}
diff --git a/src/common/session.c b/src/common/session.c
index f9a287c71..b5b49dca8 100644
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -134,7 +134,7 @@ gint session_connect(Session *session, const gchar *server, gushort port)
session->conn_id = sock_connect_async(server, port, session_connect_cb,
session);
if (session->conn_id < 0) {
- g_warning("can't connect to server.");
+ g_warning("can't connect to server");
session_close(session);
if (session->connect_finished)
session->connect_finished(session, FALSE);
@@ -147,7 +147,7 @@ gint session_connect(Session *session, const gchar *server, gushort port)
sock = sock_connect(server, port);
if (sock == NULL) {
- g_warning("can't connect to server.");
+ g_warning("can't connect to server");
session_close(session);
if (session->connect_finished)
session->connect_finished(session, FALSE);
@@ -166,7 +166,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
session->conn_id = 0;
if (!sock) {
- g_warning("can't connect to server.");
+ g_warning("can't connect to server");
session->state = SESSION_ERROR;
if (session->connect_finished)
session->connect_finished(session, FALSE);
@@ -183,7 +183,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
sock_set_nonblocking_mode(sock, FALSE);
if (proxy_connect(sock, session->server, session->port,
session->proxy_info) < 0) {
- g_warning("can't establish SOCKS connection.");
+ g_warning("can't establish SOCKS connection");
session->state = SESSION_ERROR;
return -1;
}
@@ -197,7 +197,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
if (session->ssl_type == SSL_TUNNEL) {
sock_set_nonblocking_mode(sock, FALSE);
if (!ssl_init_socket(sock)) {
- g_warning("can't initialize TLS.");
+ g_warning("can't initialize TLS");
log_error(LOG_PROTOCOL, _("TLS handshake failed\n"));
session->state = SESSION_ERROR;
if (session->connect_finished)
@@ -309,7 +309,7 @@ static gboolean session_timeout_cb(gpointer data)
{
Session *session = SESSION(data);
- g_warning("session timeout.");
+ g_warning("session timeout");
if (session->io_tag > 0) {
g_source_remove(session->io_tag);
@@ -412,14 +412,14 @@ gint session_start_tls(Session *session)
sock_set_nonblocking_mode(session->sock, FALSE);
if (!ssl_init_socket(session->sock)) {
- g_warning("couldn't start STARTTLS session.");
+ g_warning("couldn't start STARTTLS session");
if (nb_mode)
sock_set_nonblocking_mode(session->sock, session->nonblocking);
return -1;
}
if (0 < session->read_buf_len) {
- g_warning("protocol violation: suffix data after STARTTLS detected.");
+ g_warning("protocol violation: suffix data after STARTTLS detected");
if (nb_mode)
sock_set_nonblocking_mode(session->sock, session->nonblocking);
return -1;
@@ -578,7 +578,7 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
SESSION_BUFFSIZE - 1);
if (read_len == -1 && session->state == SESSION_DISCONNECTED) {
- g_warning ("sock_read: session disconnected");
+ g_warning("sock_read: session disconnected");
if (session->io_tag > 0) {
g_source_remove(session->io_tag);
session->io_tag = 0;
diff --git a/src/common/socket.c b/src/common/socket.c
index 273afb730..7446187b6 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -567,7 +567,7 @@ static gint fd_check_io(gint fd, GIOCondition cond)
if (FD_ISSET(fd, &fds)) {
return 0;
} else {
- g_warning("Socket IO timeout");
+ g_warning("socket IO timeout");
log_error(LOG_PROTOCOL, _("Socket IO timeout.\n"));
return -1;
}
@@ -919,7 +919,7 @@ static gboolean sock_get_address_info_async_cb(GIOChannel *source,
g_io_channel_set_encoding(source, NULL, &err);
if (err) {
- g_warning("can unset encoding: %s", err->message);
+ g_warning("can't unset encoding: %s", err->message);
g_error_free(err);
return FALSE;
}
diff --git a/src/common/ssl.c b/src/common/ssl.c
index 272c9ab2d..f1beb6b6a 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -429,7 +429,7 @@ gboolean ssl_init_socket(SockInfo *sockinfo)
if (claws_ssl_get_cert_file()) {
r = gnutls_certificate_set_x509_trust_file(xcred, claws_ssl_get_cert_file(), GNUTLS_X509_FMT_PEM);
if (r < 0)
- g_warning("Can't read SSL_CERT_FILE '%s': %s",
+ g_warning("can't read SSL_CERT_FILE '%s': %s",
claws_ssl_get_cert_file(),
gnutls_strerror(r));
} else {
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index ebe616818..b56e8042f 100644
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -836,7 +836,7 @@ gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len,
}
if (r < 0)
- g_warning("Can't read SSL_CERT_FILE '%s': %s",
+ g_warning("can't read SSL_CERT_FILE '%s': %s",
claws_ssl_get_cert_file(),
gnutls_strerror(r));
} else {
diff --git a/src/common/template.c b/src/common/template.c
index a7f9ea19c..fdab4b500 100644
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -202,7 +202,7 @@ GSList *template_read_config(void)
#define TRY(func) { \
if (!(func)) \
{ \
- g_warning("Failed to write template to file"); \
+ g_warning("failed to write template to file"); \
if (fp) claws_fclose(fp); \
if (new) claws_unlink(new); \
g_free(new); \
@@ -214,7 +214,7 @@ if (!(func)) \
#define TRY_NO_CLOSE(func) { \
if (!(func)) \
{ \
- g_warning("Failed to write template to file"); \
+ g_warning("failed to write template to file"); \
if (new) claws_unlink(new); \
g_free(new); \
g_free(filename); \
diff --git a/src/common/utils.c b/src/common/utils.c
index 8b1cbf0eb..d9637af44 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1509,7 +1509,7 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc,
if (tmp) {
if (!is_file_entry_regular(tmp)) {
- g_warning("Refusing to insert '%s', not a regular file\n", tmp);
+ g_warning("refusing to insert '%s', not a regular file", tmp);
} else if (!g_file_get_contents(tmp, body, NULL, NULL)) {
g_warning("couldn't set insert file '%s' in body", value);
}
@@ -2662,7 +2662,7 @@ FILE *get_command_output_stream(const char* cmdline)
/* turn the command-line string into an array */
if (!g_shell_parse_argv(cmdline, NULL, &argv, &err)) {
- g_warning("could not parse command line from '%s': %s\n", cmdline, err->message);
+ g_warning("could not parse command line from '%s': %s", cmdline, err->message);
g_error_free(err);
return NULL;
}
@@ -2671,7 +2671,7 @@ FILE *get_command_output_stream(const char* cmdline)
NULL, NULL, &pid, NULL, &fd, NULL, &err)
&& err)
{
- g_warning("could not spawn '%s': %s\n", cmdline, err->message);
+ g_warning("could not spawn '%s': %s", cmdline, err->message);
g_error_free(err);
g_strfreev(argv);
return NULL;
@@ -4642,7 +4642,7 @@ guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
g_free(tmp);
if (strlen(out) != *out_len) {
- g_warning ("strlen(out) %"G_GSIZE_FORMAT" != *out_len %"G_GSIZE_FORMAT, strlen(out), *out_len);
+ g_warning("strlen(out) %"G_GSIZE_FORMAT" != *out_len %"G_GSIZE_FORMAT, strlen(out), *out_len);
}
return out;
diff --git a/src/common/xml.c b/src/common/xml.c
index 17f1a9f95..e9e6ec539 100644
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -136,7 +136,7 @@ static GNode *xml_build_tree(XMLFile *file, GNode *parent, guint level)
while (xml_parse_next_tag(file) == 0) {
if (file->level < level) break;
if (file->level == level) {
- g_warning("xml_build_tree(): Parse error in %s", file->path);
+ g_warning("xml_build_tree(): parse error in %s", file->path);
break;
}
@@ -202,7 +202,7 @@ gint xml_get_dtd(XMLFile *file)
file->need_codeconv = FALSE;
}
} else {
- g_warning("Can't get XML DTD in %s", file->path);
+ g_warning("can't get XML DTD in %s", file->path);
return -1;
}
@@ -225,7 +225,7 @@ next:
}
if (xml_get_parenthesis(file, buf, sizeof(buf)) < 0) {
- g_warning("xml_parse_next_tag(): Can't parse next tag in %s", file->path);
+ g_warning("xml_parse_next_tag(): can't parse next tag in %s", file->path);
return -1;
}
@@ -234,7 +234,7 @@ next:
/* end-tag */
if (buf[0] == '/') {
if (strcmp(xml_get_current_tag(file)->tag, buf + 1) != 0) {
- g_warning("xml_parse_next_tag(): Tag name mismatch in %s : %s (%s)", file->path, buf, xml_get_current_tag(file)->tag);
+ g_warning("xml_parse_next_tag(): tag name mismatch in %s : %s (%s)", file->path, buf, xml_get_current_tag(file)->tag);
return -1;
}
xml_pop_tag(file);
@@ -256,7 +256,7 @@ next:
}
if (strlen(buf) == 0) {
- g_warning("xml_parse_next_tag(): Tag name is empty in %s", file->path);
+ g_warning("xml_parse_next_tag(): tag name is empty in %s", file->path);
return -1;
}
@@ -298,7 +298,7 @@ next:
while (g_ascii_isspace(*bufp)) bufp++;
attr_name = bufp;
if ((p = strchr(attr_name, '=')) == NULL) {
- g_warning("xml_parse_next_tag(): Syntax error in %s, tag (a) %s", file->path, attr_name);
+ g_warning("xml_parse_next_tag(): syntax error in %s, tag (a) %s", file->path, attr_name);
return -1;
}
bufp = p;
@@ -306,14 +306,14 @@ next:
while (g_ascii_isspace(*bufp)) bufp++;
if (*bufp != '"' && *bufp != '\'') {
- g_warning("xml_parse_next_tag(): Syntax error in %s, tag (b) %s", file->path, bufp);
+ g_warning("xml_parse_next_tag(): syntax error in %s, tag (b) %s", file->path, bufp);
return -1;
}
quote = *bufp;
bufp++;
attr_value = bufp;
if ((p = strchr(attr_value, quote)) == NULL) {
- g_warning("xml_parse_next_tag(): Syntax error in %s, tag (c) %s", file->path, attr_value);
+ g_warning("xml_parse_next_tag(): syntax error in %s, tag (c) %s", file->path, attr_value);
return -1;
}
bufp = p;
@@ -547,7 +547,7 @@ static gint xml_unescape_str(gchar *str)
while ((start = strchr(p, '&')) != NULL) {
if ((end = strchr(start + 1, ';')) == NULL) {
- g_warning("Unescaped '&' appeared");
+ g_warning("unescaped '&' appeared");
p = start + 1;
continue;
}
diff --git a/src/compose.c b/src/compose.c
index 71de99552..5794a8a8d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1754,6 +1754,11 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
if (!compose->fwdinfo)
compose->fwdinfo = procmsg_msginfo_copy(msginfo);
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
compose_extract_original_charset(compose);
if (msginfo->subject && *msginfo->subject) {
@@ -2441,7 +2446,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
fp = procmime_get_first_text_content(msginfo);
}
if (fp == NULL) {
- g_warning("Can't get text part");
+ g_warning("can't get text part");
}
if (fp != NULL) {
@@ -3982,7 +3987,7 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
outfile = procmime_get_tmp_file_name(child);
if ((err = procmime_get_part(outfile, child)) < 0)
- g_warning("Can't get the part of multipart message. (%s)", g_strerror(-err));
+ g_warning("can't get the part of multipart message. (%s)", g_strerror(-err));
else {
gchar *content_type;
@@ -5958,7 +5963,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gbool
procmsg_save_to_outbox(outbox, tmp_enc_file, TRUE);
claws_unlink(tmp_enc_file);
} else {
- g_warning("Can't open file '%s'", tmp_enc_file);
+ g_warning("can't open file '%s'", tmp_enc_file);
}
} else {
g_warning("couldn't get tempfile");
@@ -6127,7 +6132,7 @@ static ComposeQueueResult compose_queue_sub(Compose *compose, gint *msgnum, Fold
}
if (!compose->to_list && !compose->newsgroup_list) {
- g_warning("can't get recipient list.");
+ g_warning("can't get recipient list");
return COMPOSE_QUEUE_ERROR_NO_MSG;
}
@@ -9658,7 +9663,7 @@ static void compose_exec_ext_editor(Compose *compose)
}
} else {
if (prefs_common_get_ext_editor_cmd())
- g_warning("External editor command-line is invalid: '%s'",
+ g_warning("external editor command-line is invalid: '%s'",
prefs_common_get_ext_editor_cmd());
cmd = g_strdup_printf(DEFAULT_EDITOR_CMD, tmp);
}
@@ -9801,8 +9806,8 @@ static gboolean compose_ext_editor_kill(Compose *compose)
waitpid(compose->exteditor_pid, NULL, 0);
#endif /* G_OS_WIN32 */
- g_warning("Terminated process id: %d. "
- "Temporary file: %s", pid, compose->exteditor_file);
+ g_warning("terminated process id: %d, "
+ "temporary file: %s", pid, compose->exteditor_file);
g_spawn_close_pid(compose->exteditor_pid);
compose_set_ext_editor_sensitive(compose, TRUE);
@@ -9931,7 +9936,7 @@ static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", undostruct->undo_state);
break;
default:
- g_warning("Undo state not recognized");
+ g_warning("undo state not recognized");
break;
}
@@ -9954,7 +9959,7 @@ static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", undostruct->redo_state);
break;
default:
- g_warning("Redo state not recognized");
+ g_warning("redo state not recognized");
break;
}
}
@@ -11350,7 +11355,7 @@ static void compose_advanced_action_cb(GtkAction *gaction, gpointer data)
if (action_table[action].do_action)
action_table[action].do_action(text);
else
- g_warning("Not implemented yet.");
+ g_warning("not implemented yet");
}
}
diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
index 2a6e09386..151c68e2e 100644
--- a/src/etpan/Makefile.am
+++ b/src/etpan/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gtk \
$(GTK_CFLAGS) \
$(LIBETPAN_CFLAGS) \
+ $(GNUTLS_CFLAGS) \
$(ENCHANT_CFLAGS)
libclawsetpan_la_LIBADD = \
diff --git a/src/export.c b/src/export.c
index 1d5a90f8e..04feb7ed8 100644
--- a/src/export.c
+++ b/src/export.c
@@ -207,7 +207,7 @@ static void export_ok_cb(GtkWidget *widget, gpointer data)
mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
if (!mbox) {
- g_warning("export_ok_cb(): failed to convert character set.");
+ g_warning("export_ok_cb(): failed to convert character set");
mbox = g_strdup(utf8mbox);
}
@@ -246,7 +246,7 @@ static void export_filesel_cb(GtkWidget *widget, gpointer data)
conv_get_locale_charset_str(),
CS_UTF_8);
if (!filename) {
- g_warning("export_filesel_cb(): failed to convert character set.");
+ g_warning("export_filesel_cb(): failed to convert character set");
filename = g_strdup(oldstr);
}
gtk_entry_set_text(GTK_ENTRY(file_entry), filename);
diff --git a/src/folder.c b/src/folder.c
index b7a0d47a4..8f3e9a363 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -902,7 +902,7 @@ void folder_write_list(void)
if (xml_file_put_xml_decl(pfile->fp) < 0) {
prefs_file_close_revert(pfile);
- g_warning("failed to start write folder list.");
+ g_warning("failed to start write folder list");
return;
}
tag = xml_tag_new("folderlist");
@@ -930,9 +930,9 @@ void folder_write_list(void)
if (xml_write_tree(rootnode, pfile->fp) < 0) {
prefs_file_close_revert(pfile);
- g_warning("failed to write folder list.");
+ g_warning("failed to write folder list");
} else if (prefs_file_close(pfile) < 0) {
- g_warning("failed to write folder list.");
+ g_warning("failed to write folder list");
}
xml_free_tree(rootnode);
}
@@ -1878,7 +1878,7 @@ void folder_set_missing_folders(void)
continue;
if (folder->klass->create_tree(folder) < 0) {
- g_warning("%s: can't create the folder tree.",
+ g_warning("%s: can't create the folder tree",
LOCAL_FOLDER(folder)->rootpath);
continue;
}
diff --git a/src/folderview.c b/src/folderview.c
index a080274f3..6307daf0d 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1852,7 +1852,7 @@ static void set_special_folder(GtkCMCTree *ctree, FolderItem *item,
node = gtk_cmctree_find_by_row_data(ctree, root, item);
if (!node)
- g_warning("%s not found.", item->path);
+ g_warning("%s not found", item->path);
else {
parent = GTK_CMCTREE_ROW(node)->parent;
if (*prev && parent == GTK_CMCTREE_ROW(*prev)->parent)
diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 7b6db5f83..0288452d7 100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -82,6 +82,7 @@ AM_CPPFLAGS = \
-I$(srcdir)/.. \
-I$(builddir)/.. \
$(GTK_CFLAGS) \
+ $(GNUTLS_CFLAGS) \
$(ENCHANT_CFLAGS) \
-DPLUGINDIR=\"$(PLUGINDIR)\" \
-DDOCDIR=\"$(DOCDIR)\"
diff --git a/src/gtk/about.c b/src/gtk/about.c
index eb14eba7b..c1e0e88a0 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -656,7 +656,7 @@ static GtkWidget *about_create_child_page_release_notes(void)
tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
if (!tmp) {
- g_warning("Failed to convert character set of action configuration");
+ g_warning("failed to convert character set of action configuration");
tmp = g_strdup(buf);
}
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index ec5081834..8a05ec8e1 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -976,7 +976,7 @@ GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
cm_return_val_if_fail (tree_column >= 0, NULL);
if (tree_column >= columns) {
- g_warning("Wrong tree column");
+ g_warning("wrong tree column");
tree_column = 0;
print_backtrace();
}
diff --git a/src/gtk/gtkunit.c b/src/gtk/gtkunit.c
index 4c0f47a41..fcc88d5d8 100644
--- a/src/gtk/gtkunit.c
+++ b/src/gtk/gtkunit.c
@@ -126,7 +126,7 @@ string_to_unit (const GValue *src_value,
return;
error:
- g_warning ("Can't convert string to GtkCMUnit.");
+ g_warning("can't convert string to GtkCMUnit");
}
@@ -447,7 +447,7 @@ gtk_unit_format_string (const gchar *format,
switch (*format)
{
case 0:
- g_warning ("%s: unit-menu-format string ended within %%-sequence",
+ g_warning("%s: unit-menu-format string ended within %%-sequence",
G_STRFUNC);
break;
@@ -481,7 +481,7 @@ gtk_unit_format_string (const gchar *format,
break;
default:
- g_warning ("%s: unit-menu-format contains unknown format "
+ g_warning("%s: unit-menu-format contains unknown format "
"sequence '%%%c'", G_STRFUNC, *format);
break;
}
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 6849bab69..612d9796e 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -430,7 +430,7 @@ static gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s",
+ g_warning("an error occurred while converting a string from UTF-8 to UCS-4: %s",
error->message);
g_error_free(error);
}
@@ -466,7 +466,7 @@ static gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
if (error != NULL) {
- g_warning("An error occurred while converting a string from UTF-8 to UCS-4: %s",
+ g_warning("an error occurred while converting a string from UTF-8 to UCS-4: %s",
error->message);
g_error_free(error);
}
diff --git a/src/headerview.c b/src/headerview.c
index 433c26386..81e739c14 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -278,7 +278,7 @@ static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginf
if (!is_file_exist(filename)) {
gdk_pixbuf_save(picture, filename, "png", &error, NULL);
if (error) {
- g_warning("Failed to save image: %s",
+ g_warning("failed to save image: %s",
error->message);
g_error_free(error);
}
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 5cbb8f787..78ee9727e 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -84,7 +84,7 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
stream = procmime_get_part_as_inputstream(imageviewer->mimeinfo);
if (stream == NULL) {
- g_warning("Couldn't get image MIME part");
+ g_warning("couldn't get image MIME part");
return;
}
@@ -96,7 +96,7 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
g_object_unref(stream);
if (error) {
- g_warning("Couldn't load image: %s\n", error->message);
+ g_warning("couldn't load image: %s", error->message);
gtk_label_set_text(GTK_LABEL(imageviewer->error_lbl), _("Error:"));
gtk_label_set_text(GTK_LABEL(imageviewer->error_msg), error->message);
gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 0);
@@ -127,7 +127,7 @@ static void image_viewer_load_image(ImageViewer *imageviewer)
}
if (!pixbuf && !animation) {
- g_warning("Couldn't load the image");
+ g_warning("couldn't load the image");
return;
}
diff --git a/src/imap.c b/src/imap.c
index e11bceac4..9ae4c5435 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1952,7 +1952,7 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
msginfo = (MsgInfo *)msglist->data;
src = msginfo->folder;
if (!same_dest_ok && src == dest) {
- g_warning("the src folder is identical to the dest.");
+ g_warning("the src folder is identical to the dest");
return -1;
}
@@ -3117,12 +3117,12 @@ static FolderItem *imap_create_special_folder(Folder *folder,
new_item = imap_create_folder(folder, item, name);
if (!new_item) {
- g_warning("Can't create '%s'", name);
+ g_warning("can't create '%s'", name);
if (!folder->inbox) return NULL;
new_item = imap_create_folder(folder, folder->inbox, name);
if (!new_item)
- g_warning("Can't create '%s' under INBOX", name);
+ g_warning("can't create '%s' under INBOX", name);
else
new_item->stype = stype;
} else
@@ -3384,8 +3384,7 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
if (strchr(name, imap_get_path_separator(session, IMAP_FOLDER(folder), item->path, &ok)) != NULL ||
is_fatal(ok)) {
- g_warning("New folder name must not contain the namespace "
- "path separator");
+ g_warning("new folder name must not contain the namespace path separator");
return -1;
}
diff --git a/src/import.c b/src/import.c
index a7069b58c..6553700c5 100644
--- a/src/import.c
+++ b/src/import.c
@@ -210,7 +210,7 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
if (!mbox) {
- g_warning("import_ok_cb(): failed to convert character set.");
+ g_warning("import_ok_cb(): failed to convert character set");
mbox = g_strdup(utf8mbox);
}
@@ -254,7 +254,7 @@ static void import_filesel_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("import_filesel_cb(): failed to convert character set.");
+ g_warning("import_filesel_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(file_entry), utf8_filename);
diff --git a/src/main.c b/src/main.c
index 582500946..39f8cd5da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -658,7 +658,7 @@ static void sc_session_manager_connect(MainWindow *mainwin)
g_free(client_id);
if (error_string_ret[0] || mainwin->smc_conn == NULL)
- g_warning ("While connecting to session manager: %s.",
+ g_warning("while connecting to session manager: %s",
error_string_ret);
else {
SmPropValue *vals;
@@ -1024,14 +1024,14 @@ static void install_dbus_status_handler(void)
"com.google.code.Awn");
dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL);
if (dbus_item_hook_id == HOOK_NONE) {
- g_warning("Failed to register folder item update hook");
+ g_warning("failed to register folder item update hook");
uninstall_dbus_status_handler();
return;
}
dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL);
if (dbus_folder_hook_id == HOOK_NONE) {
- g_warning("Failed to register folder update hook");
+ g_warning("failed to register folder update hook");
uninstall_dbus_status_handler();
return;
}
@@ -1491,7 +1491,7 @@ int main(int argc, char *argv[])
}
/* make the crash-indicator file */
if (str_write_to_file("foo", get_crashfile_name(), FALSE) < 0) {
- g_warning("Can't create the crash-indicator file.");
+ g_warning("can't create the crash-indicator file");
}
inc_autocheck_timer_init(mainwin);
@@ -2535,7 +2535,7 @@ static gint prohibit_duplicate_launch(int *argc, char ***argv)
buf[sizeof(buf) - 1] = '\0';
if (!STRNCMP(buf, ".\n")) break;
if (claws_fputs(buf, stdout) == EOF) {
- g_warning("writing to stdout failed.");
+ g_warning("writing to stdout failed");
break;
}
}
@@ -2549,7 +2549,7 @@ static gint prohibit_duplicate_launch(int *argc, char ***argv)
buf[sizeof(buf) - 1] = '\0';
if (!STRNCMP(buf, ".\n")) break;
if (claws_fputs(buf, stdout) == EOF) {
- g_warning("writing to stdout failed.");
+ g_warning("writing to stdout failed");
break;
}
}
@@ -2572,7 +2572,7 @@ static gint prohibit_duplicate_launch(int *argc, char ***argv)
buf[sizeof(buf) - 1] = '\0';
if (!STRNCMP(buf, ".\n")) break;
if (claws_fputs(buf, stdout) == EOF) {
- g_warning("writing to stdout failed.");
+ g_warning("writing to stdout failed");
break;
}
}
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 4ef8ad159..681bc90e2 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3756,7 +3756,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
break;
default:
- g_warning("Unknown layout");
+ g_warning("unknown layout");
return;
}
@@ -4278,7 +4278,7 @@ static void addressbook_open_cb(GtkAction *action, gpointer data)
addressbook_dbus_open(FALSE, &error);
if (error) {
- g_warning("Failed to open address book: %s", error->message);
+ g_warning("failed to open address book: %s", error->message);
g_error_free(error);
}
#endif
diff --git a/src/mbox.c b/src/mbox.c
index cf3d0d363..d01c2e613 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -108,7 +108,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
/* ignore empty lines on the head */
do {
if (claws_fgets(buf, sizeof(buf), mbox_fp) == NULL) {
- g_warning("can't read mbox file.");
+ g_warning("can't read mbox file");
claws_fclose(mbox_fp);
return -1;
}
@@ -322,7 +322,7 @@ gint lock_mbox(const gchar *base, LockType type)
lockfile = g_strdup_printf("%s.%d", base, getpid());
if ((lockfp = claws_fopen(lockfile, "wb")) == NULL) {
FILE_OP_ERROR(lockfile, "claws_fopen");
- g_warning("can't create lock file '%s', use 'flock' instead of 'file' if possible.", lockfile);
+ g_warning("can't create lock file '%s', use 'flock' instead of 'file' if possible", lockfile);
g_free(lockfile);
return -1;
}
@@ -350,8 +350,7 @@ gint lock_mbox(const gchar *base, LockType type)
return -1;
}
if (retry == 0)
- g_warning("mailbox is owned by another"
- " process, waiting...");
+ g_warning("mailbox is owned by another process, waiting");
retry++;
sleep(5);
}
@@ -497,7 +496,7 @@ gint copy_mbox(gint srcfd, const gchar *dest)
while ((n_read = read(srcfd, buf, sizeof(buf))) > 0) {
if (claws_fwrite(buf, 1, n_read, dest_fp) < n_read) {
- g_warning("writing to %s failed.", dest);
+ g_warning("writing to %s failed", dest);
claws_fclose(dest_fp);
claws_unlink(dest);
return -1;
@@ -529,7 +528,7 @@ void empty_mbox(const gchar *mbox)
if ((fp = claws_fopen(mbox, "wb")) == NULL) {
FILE_OP_ERROR(mbox, "claws_fopen");
- g_warning("can't truncate mailbox to zero.");
+ g_warning("can't truncate mailbox to zero");
return;
}
claws_safe_fclose(fp);
diff --git a/src/messageview.c b/src/messageview.c
index 1921b6612..d6ecea05d 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1376,7 +1376,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
statusbar_pop_all();
if (!file) {
- g_warning("can't get message file path.");
+ g_warning("can't get message file path");
textview_show_error(messageview->mimeview->textview);
return -1;
}
@@ -1927,7 +1927,7 @@ static void return_receipt_send_clicked(NoticeView *noticeview, MsgInfo *msginfo
file = procmsg_get_message_file_path(msginfo);
if (!file) {
- g_warning("can't get message file path.");
+ g_warning("can't get message file path");
return;
}
@@ -2838,7 +2838,7 @@ static void addressbook_open_cb(GtkAction *action, gpointer data)
addressbook_dbus_open(FALSE, &error);
if (error) {
- g_warning("Failed to open address book: %s", error->message);
+ g_warning("failed to open address book: %s", error->message);
g_error_free(error);
}
#endif
diff --git a/src/mh.c b/src/mh.c
index 135975c05..85be5e907 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -259,7 +259,7 @@ static void mh_get_last_num(Folder *folder, FolderItem *item)
cm_return_if_fail(path != NULL);
if ((dp = g_dir_open(path, 0, &error)) == NULL) {
- g_warning("Couldn't open directory '%s': %s (%d)",
+ g_warning("couldn't open directory '%s': %s (%d)",
path, error->message, error->code);
g_error_free(error);
g_free(path);
@@ -494,7 +494,7 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
cm_return_val_if_fail(msginfo != NULL, -1);
if (msginfo->folder == dest) {
- g_warning("the src folder is identical to the dest.");
+ g_warning("the src folder is identical to the dest");
return -1;
}
@@ -807,8 +807,8 @@ static gint mh_scan_tree(Folder *folder)
{ \
if (!is_dir_exist(dir)) { \
if (is_file_exist(dir)) { \
- g_warning("File '%s' already exists. " \
- "Can't create folder.", dir); \
+ g_warning("file '%s' already exists, " \
+ "can't create folder", dir); \
return -1; \
} \
if (make_dir_hier(dir) < 0) \
diff --git a/src/msgcache.c b/src/msgcache.c
index fd0739773..d1abccd89 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -306,7 +306,7 @@ gint msgcache_get_memory_usage(MsgCache *cache)
size_t ni; \
\
if ((ni = claws_fread(&idata, sizeof(idata), 1, fp)) != 1) { \
- g_warning("read_int: Cache data corrupted, read %"G_GSIZE_FORMAT" of %"G_GSIZE_FORMAT" at " \
+ g_warning("read_int: cache data corrupted, read %"G_GSIZE_FORMAT" of %"G_GSIZE_FORMAT" at " \
"offset %ld", ni, sizeof(idata), ftell(fp)); \
procmsg_msginfo_free(&msginfo); \
error = TRUE; \
@@ -467,7 +467,7 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
if (!swapping) {
if ((ni = claws_fread(&len, sizeof(len), 1, fp) != 1) ||
len > G_MAXINT) {
- g_warning("read_data_str: Cache data (len) corrupted, read %"G_GSIZE_FORMAT
+ g_warning("read_data_str: cache data (len) corrupted, read %"G_GSIZE_FORMAT
" of %"G_GSIZE_FORMAT" bytes at offset %ld", ni, sizeof(len),
ftell(fp));
return -1;
@@ -475,7 +475,7 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
} else {
if ((ni = claws_fread(&len, sizeof(len), 1, fp) != 1) ||
bswap_32(len) > G_MAXINT) {
- g_warning("read_data_str: Cache data (len) corrupted, read %"G_GSIZE_FORMAT
+ g_warning("read_data_str: cache data (len) corrupted, read %"G_GSIZE_FORMAT
" of %"G_GSIZE_FORMAT" bytes at offset %ld", ni, sizeof(len),
ftell(fp));
return -1;
@@ -493,7 +493,7 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
}
if ((ni = claws_fread(tmpstr, 1, len, fp)) != len) {
- g_warning("read_data_str: Cache data corrupted, read %"G_GSIZE_FORMAT" of %u "
+ g_warning("read_data_str: cache data corrupted, read %"G_GSIZE_FORMAT" of %u "
"bytes at offset %ld",
ni, len, ftell(fp));
g_free(tmpstr);
@@ -521,7 +521,7 @@ static gint msgcache_get_cache_data_str(gchar *src, gchar **str, gint len,
return 0;
if(len > 2*1024*1024) {
- g_warning("read_data_str: refusing to allocate %d bytes.", len);
+ g_warning("read_data_str: refusing to allocate %d bytes", len);
return -1;
}
diff --git a/src/partial_download.c b/src/partial_download.c
index 3edb63583..8ca3bbdb8 100644
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -149,7 +149,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
filename = procmsg_get_message_file_path(msginfo);
if (!filename) {
- g_warning("can't get message file path.");
+ g_warning("can't get message file path");
return err;
}
tinfo = procheader_parse_file(filename, msginfo->flags, TRUE, TRUE);
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index cc794db62..3f30013c2 100644
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -25,6 +25,7 @@ acpi_notifier_la_CPPFLAGS = \
-I$(top_builddir)/src/common \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS) \
+ $(GNUTLS_CFLAGS)
.PHONY: test
diff --git a/src/plugins/acpi_notifier/acpi_notifier.c b/src/plugins/acpi_notifier/acpi_notifier.c
index a6b837309..c54b745be 100644
--- a/src/plugins/acpi_notifier/acpi_notifier.c
+++ b/src/plugins/acpi_notifier/acpi_notifier.c
@@ -623,7 +623,7 @@ static void acpi_prefs_save_func(PrefsPage * _page)
if (prefs_write_param(param, pfile->fp) < 0) {
g_warning("failed to write " PREFS_BLOCK_NAME
- " configuration to file\n");
+ " configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 1ec3d05a5..c0b87d397 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -57,7 +57,8 @@ address_keeper_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(ENCHANT_CFLAGS)
+ $(ENCHANT_CFLAGS) \
+ $(GNUTLS_CFLAGS)
address_keeper_la_SOURCES = \
address_keeper.c \
diff --git a/src/plugins/address_keeper/address_keeper_prefs.c b/src/plugins/address_keeper/address_keeper_prefs.c
index 35e220210..dfb32c674 100644
--- a/src/plugins/address_keeper/address_keeper_prefs.c
+++ b/src/plugins/address_keeper/address_keeper_prefs.c
@@ -230,7 +230,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");
+ g_warning("failed to write Address Keeper configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/archive/archiver_prefs.c b/src/plugins/archive/archiver_prefs.c
index 00eac4c98..ca99a115e 100644
--- a/src/plugins/archive/archiver_prefs.c
+++ b/src/plugins/archive/archiver_prefs.c
@@ -553,7 +553,7 @@ static void save_archiver_prefs(PrefsPage * _page)
return;
if (prefs_write_param(param, pref_file->fp) < 0) {
- g_warning("failed to write Archiver Plugin configuration");
+ g_warning("failed to write Archiver plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 32f75bfb9..a8819d8f6 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -198,7 +198,7 @@ gboolean before_date(time_t msg_mtime, const gchar* before) {
debug_print("Cut-off date: %s\n", before);
if ((date = iso2GDate(before)) == NULL) {
- g_warning("Bad date format: %s", before);
+ g_warning("bad date format: %s", before);
return FALSE;
}
@@ -213,7 +213,7 @@ gboolean before_date(time_t msg_mtime, const gchar* before) {
}
if (! g_date_valid(file_t)) {
- g_warning("Invalid msg date");
+ g_warning("invalid msg date");
return FALSE;
}
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 424a4fa4e..6ab55aadc 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -57,7 +57,8 @@ att_remover_la_CPPFLAGS = \
$(IFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(ENCHANT_CFLAGS)
+ $(ENCHANT_CFLAGS) \
+ $(GNUTLS_CFLAGS)
att_remover_la_SOURCES = \
att_remover.c
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index 505eefb0a..5648e8304 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -562,7 +562,7 @@ gboolean plugin_done(void)
return TRUE;
if (prefs_write_param(prefs, pref_file->fp) < 0) {
- g_warning("failed to write AttRemover Plugin configuration");
+ g_warning("failed to write AttRemover plugin configuration");
prefs_file_close_revert(pref_file);
return TRUE;
}
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index 36cc86a90..9b9488e32 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -177,7 +177,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");
+ g_warning("failed to write Attach warner configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 2f3cb88f8..1d438d3db 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -883,7 +883,7 @@ void bogofilter_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write Bogofilter configuration to file");
+ g_warning("failed to write Bogofilter configuration to file");
prefs_file_close_revert(pfile);
return;
}
@@ -1026,7 +1026,7 @@ void bogofilter_register_hook(void)
if (hook_id == HOOK_NONE)
hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);
if (hook_id == HOOK_NONE) {
- g_warning("Failed to register mail filtering hook");
+ g_warning("failed to register mail filtering hook");
config.process_emails = FALSE;
}
}
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index 1dcabe3d7..2de88de08 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -511,7 +511,7 @@ void bsfilter_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write Bsfilter configuration to file");
+ g_warning("failed to write Bsfilter configuration to file");
prefs_file_close_revert(pfile);
return;
}
@@ -657,7 +657,7 @@ void bsfilter_register_hook(void)
if (hook_id == HOOK_NONE)
hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
if (hook_id == HOOK_NONE) {
- g_warning("Failed to register mail filtering hook");
+ g_warning("failed to register mail filtering hook");
config.process_emails = FALSE;
}
}
diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index 5d99122bd..dac5ff9e7 100644
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -90,11 +90,11 @@ static gboolean scan_func(GNode *node, gpointer data)
outfile = procmime_get_tmp_file_name(mimeinfo);
if (procmime_get_part(outfile, mimeinfo) < 0)
- g_warning("Can't get the part of multipart message.");
+ g_warning("can't get the part of multipart message");
else {
max = config.clamav_max_size * 1048576; /* maximum file size */
if (g_stat(outfile, &info) == -1)
- g_warning("Can't determine file size");
+ g_warning("can't determine file size");
else {
if (info.st_size <= max) {
debug_print("Scanning %s\n", outfile);
@@ -102,7 +102,7 @@ static gboolean scan_func(GNode *node, gpointer data)
debug_print("status: %d\n", result->status);
switch (result->status) {
case NO_SOCKET:
- g_warning("[scanning] No socket information");
+ g_warning("[scanning] no socket information");
if (config.alert_ack) {
alertpanel_error(_("Scanning\nNo socket information.\nAntivirus disabled."));
config.alert_ack = FALSE;
@@ -294,7 +294,7 @@ gint plugin_init(gchar **error)
Clamd_Stat status = clamd_prepare();
switch (status) {
case NO_SOCKET:
- g_warning("[init] No socket information");
+ g_warning("[init] no socket information");
alertpanel_error(_("Init\nNo socket information.\nAntivirus disabled."));
break;
case NO_CONNECTION:
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index bfcbb78c9..887c91a5b 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -509,7 +509,7 @@ static void clamav_save_func(PrefsPage *_page)
Clamd_Stat status = clamd_prepare();
switch (status) {
case NO_SOCKET:
- g_warning("[New config] No socket information");
+ g_warning("[New config] no socket information");
alertpanel_error(_("New config\nNo socket information.\nAntivirus disabled."));
break;
case NO_CONNECTION:
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index ecb702503..858ca0436 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -99,7 +99,7 @@ void clamd_create_config_automatic(const gchar* path) {
/*debug_set_mode(TRUE);*/
/*debug_print("%s : %s\n", folder, path);*/
if (! path) {
- g_warning("Missing path");
+ g_warning("missing path");
return;
}
if (config && config->ConfigType == AUTOMATIC &&
@@ -221,7 +221,7 @@ void clamd_create_config_automatic(const gchar* path) {
void clamd_create_config_manual(const gchar* host, int port) {
if (! host || port < 1) {
- g_warning("Missing host or port < 1");
+ g_warning("missing host or port < 1");
return;
}
if (config && config->ConfigType == MANUAL &&
diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index 3df83cdf5..d08807732 100644
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -73,7 +73,7 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
- return _("This Plugin is only a demo of how to write plugins for Claws Mail. "
+ return _("This plugin is only a demo of how to write plugins for Claws Mail. "
"It installs a hook for new log output and writes it to stdout."
"\n\n"
"It is not really useful.");
diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
index 4ac00a835..3d1cdec07 100644
--- a/src/plugins/dillo/dillo_prefs.c
+++ b/src/plugins/dillo/dillo_prefs.c
@@ -290,7 +290,7 @@ static void save_dillo_prefs(PrefsPage *page)
return;
if (prefs_write_param(param, pref_file->fp) < 0) {
- g_warning("failed to write Dillo Plugin configuration\n");
+ g_warning("failed to write Dillo plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index c014ee1ca..3b5534307 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -354,7 +354,7 @@ static void fancy_prefs_stylesheet_browse_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("fancy_prefs_stylesheet_browse_cb(): failed to convert character set.");
+ g_warning("fancy_prefs_stylesheet_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(dest), utf8_filename);
@@ -409,7 +409,7 @@ static void save_fancy_prefs(PrefsPage *page)
return;
if (prefs_write_param(param, pref_file->fp) < 0) {
- g_warning("failed to write Fancy Plugin configuration");
+ g_warning("failed to write Fancy plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/gdata/gdata_plugin.c b/src/plugins/gdata/gdata_plugin.c
index 92fa2e1ed..071cb3168 100644
--- a/src/plugins/gdata/gdata_plugin.c
+++ b/src/plugins/gdata/gdata_plugin.c
@@ -73,7 +73,7 @@ static void cm_gdata_save_config(void)
if (prefs_write_param(cm_gdata_param, pfile->fp) < 0) {
debug_print("failed!\n");
- g_warning("GData Plugin: Failed to write plugin configuration to file");
+ g_warning("GData plugin: failed to write plugin configuration to file");
prefs_file_close_revert(pfile);
return;
}
diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
index 6f749d14e..e45db3bf2 100644
--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
@@ -173,13 +173,13 @@ void container_linux::update_image_cache(const gchar *url, GdkPixbuf *image)
lock_images_cache();
auto i = m_images.find(url);
if(i == m_images.end()) {
- g_warning("image '%s' was not found in pixbuf cache\n", url);
+ g_warning("image '%s' was not found in pixbuf cache", url);
unlock_images_cache();
return;
}
if(i->second.first != NULL && i->second.first != image) {
- g_warning("pixbuf pointer for image '%s' changed\n", url);
+ g_warning("pixbuf pointer for image '%s' changed", url);
g_object_unref(i->second.first);
}
@@ -263,7 +263,7 @@ gint container_linux::clear_images(gsize desired_size)
auto i = m_images.find(l->first);
if(i == m_images.end()) {
- g_warning("failed to find '%s' in m_images\n", l->first.c_str());
+ g_warning("failed to find '%s' in m_images", l->first.c_str());
continue;
}
diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index 3ea63a79f..c8f331006 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -91,7 +91,7 @@ static void lh_show_mimepart(MimeViewer *_viewer, const gchar *infile,
const gchar *charset;
if (string == NULL) {
- g_warning("LH: couldn't get MIME part file\n");
+ g_warning("LH: couldn't get MIME part file");
return;
}
diff --git a/src/plugins/litehtml_viewer/lh_widget.cpp b/src/plugins/litehtml_viewer/lh_widget.cpp
index 7c73346c5..279f9319a 100644
--- a/src/plugins/litehtml_viewer/lh_widget.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget.cpp
@@ -465,7 +465,7 @@ GdkPixbuf *lh_widget::get_local_image(const litehtml::tstring url) const
pixbuf = procmime_get_part_as_pixbuf(p, &error);
if (error != NULL) {
- g_warning("Couldn't load image: %s\n", error->message);
+ g_warning("couldn't load image: %s", error->message);
g_error_free(error);
return NULL;
}
diff --git a/src/plugins/managesieve/managesieve.c b/src/plugins/managesieve/managesieve.c
index d4d40e837..ba5ac50f3 100644
--- a/src/plugins/managesieve/managesieve.c
+++ b/src/plugins/managesieve/managesieve.c
@@ -155,7 +155,7 @@ static gboolean sieve_read_chunk_cb(SockInfo *source,
if (read_len == -1 &&
session->state == SESSION_DISCONNECTED) {
- g_warning ("sock_read: session disconnected");
+ g_warning("sock_read: session disconnected");
if (session->io_tag > 0) {
g_source_remove(session->io_tag);
session->io_tag = 0;
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index 725cef828..17c3c0ed0 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -489,7 +489,7 @@ static void sieve_editor_undo_state_changed(UndoMain *undostruct,
cm_menu_set_sensitive_full(page->ui_manager, "Menu/Edit/Undo", undostruct->undo_state);
break;
default:
- g_warning("Undo state not recognized");
+ g_warning("undo state not recognized");
break;
}
@@ -512,7 +512,7 @@ static void sieve_editor_undo_state_changed(UndoMain *undostruct,
cm_menu_set_sensitive_full(page->ui_manager, "Menu/Edit/Redo", undostruct->redo_state);
break;
default:
- g_warning("Redo state not recognized");
+ g_warning("redo state not recognized");
break;
}
}
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index c40870e98..4431e7fee 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -455,7 +455,7 @@ void sieve_prefs_done(void)
return;
if (prefs_write_param(prefs, pref_file->fp) < 0) {
- g_warning("failed to write ManageSieve Plugin configuration");
+ g_warning("failed to write ManageSieve plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
index fd4ce16dd..239b9a2e1 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
@@ -168,7 +168,7 @@ gtk_hotkey_key_file_registry_real_get_all_hotkeys (GtkHotkeyRegistry *base)
app_id->str,
&error);
if (error) {
- g_warning ("Failed to read hotkeys for application '%s': %s",
+ g_warning("failed to read hotkeys for application '%s': %s",
app_id->str, error->message);
g_error_free (error);
error = NULL;
@@ -185,7 +185,7 @@ gtk_hotkey_key_file_registry_real_get_all_hotkeys (GtkHotkeyRegistry *base)
if (error) {
gchar *path = g_file_get_path (home);
- g_warning ("Failed to read hotkey home directory '%s': %s",
+ g_warning("failed to read hotkey home directory '%s': %s",
path, error->message);
g_free (path);
g_error_free (error);
@@ -677,7 +677,7 @@ get_all_hotkey_infos_from_key_file (GKeyFile *keyfile,
/* Ignore non hotkey groups */
if (!g_str_has_prefix (key_id->str, HOTKEY_GROUP)) {
- g_warning ("Hotkey file for %s contains non 'hotkey:' group '%s'",
+ g_warning("hotkey file for %s contains non 'hotkey:' group '%s'",
app_id, group);
g_string_free (key_id, TRUE);
continue;
@@ -689,7 +689,7 @@ get_all_hotkey_infos_from_key_file (GKeyFile *keyfile,
error = NULL;
hotkey = get_hotkey_info_from_key_file (keyfile, app_id, key_id->str, &error);
if (error) {
- g_warning ("Failed to read hotkey '%s' for application '%s': %s",
+ g_warning("failed to read hotkey '%s' for application '%s': %s",
key_id->str, app_id, error->message);
g_error_free (error);
g_string_free (key_id, TRUE);
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
index 22b850d24..16f77d3da 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
@@ -72,7 +72,7 @@ gtk_hotkey_x11_listener_real_bind_hotkey (GtkHotkeyListener *base,
if (find_hotkey_from_key_id(self,
gtk_hotkey_info_get_key_id (hotkey))) {
- g_warning ("Hotkey '%s' already registered. Ignoring register request.",
+ g_warning("hotkey '%s' already registered. Ignoring register request",
gtk_hotkey_info_get_key_id (hotkey));
return FALSE;
}
diff --git a/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c b/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
index 01cf302ef..92cc1f663 100644
--- a/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
+++ b/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
@@ -129,7 +129,7 @@ do_grab_key (Binding *binding)
gdk_flush ();
if (gdk_error_trap_pop ()) {
- g_warning ("Binding '%s' failed!", binding->keystring);
+ g_warning("binding '%s' failed!", binding->keystring);
return FALSE;
}
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index ce556ee49..58992d129 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -239,7 +239,7 @@ void notification_foldercheck_write_array(void)
path = foldercheck_get_array_path();
if((pfile = prefs_write_open(path)) == NULL) {
- debug_print("Notification Plugin Error: Cannot open "
+ debug_print("Notification plugin error: cannot open "
"file " FOLDERCHECK_ARRAY " for writing\n");
return;
}
@@ -290,7 +290,7 @@ void notification_foldercheck_write_array(void)
xml_write_tree(rootnode, pfile->fp);
if(prefs_file_close(pfile) < 0) {
- debug_print("Notification Plugin Error: Failed to write "
+ debug_print("Notification plugin error: failed to write "
"file " FOLDERCHECK_ARRAY "\n");
}
@@ -361,7 +361,7 @@ gboolean notification_foldercheck_read_array(void)
}
}
if((list == NULL) || (entry == NULL)) {
- g_warning("Did not find attribute \"name\" in tag \"branch\"");
+ g_warning("did not find attribute \"name\" in tag \"branch\"");
continue; /* with next branch */
}
@@ -371,8 +371,8 @@ gboolean notification_foldercheck_read_array(void)
/* These should all be leaves. */
if(!G_NODE_IS_LEAF(node))
- g_warning("Subnodes in \"branch\" nodes should all be leaves. "
- "Ignoring deeper subnodes.");
+ g_warning("subnodes in \"branch\" nodes should all be leaves, "
+ "ignoring deeper subnodes");
/* Check if tag is "folderitem" */
xmlnode = node->data;
@@ -393,7 +393,7 @@ gboolean notification_foldercheck_read_array(void)
}
}
if((list == NULL) || (item == NULL)) {
- g_warning("Did not find attribute \"identifier\" in tag "
+ g_warning("did not find attribute \"identifier\" in tag "
"\"folderitem\"");
continue; /* with next leaf node */
}
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 0279cac6b..1c71a1bbc 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -583,7 +583,7 @@ void notify_save_config(void)
if (prefs_write_param(notify_param, pfile->fp) < 0) {
debug_print("failed!\n");
- g_warning("Notification Plugin: Failed to write plugin configuration "
+ g_warning("notification plugin: failed to write plugin configuration "
"to file");
prefs_file_close_revert(pfile);
return;
@@ -1285,7 +1285,7 @@ static void notify_command_browse_cb(GtkWidget* widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("notify_command_browse_cb(): failed to convert character set.");
+ g_warning("notify_command_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(dest), utf8_filename);
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index c04f594a6..cf62eaf8f 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -861,7 +861,7 @@ static void pdf_viewer_button_press_events_cb(GtkWidget *widget, GdkEventButton
dest = poppler_document_find_dest(
viewer->pdf_doc, viewer->link_action->goto_remote.dest->named_dest);
if (dest->type != POPPLER_DEST_XYZ) {
- g_warning ("couldn't figure out link");
+ g_warning("couldn't figure out link");
poppler_dest_free(dest);
break;
}
@@ -1451,7 +1451,7 @@ static void pdf_viewer_update(MimeViewer *_viewer, gboolean reload_file, int pag
viewer->pdf_page = poppler_document_get_page(viewer->pdf_doc, page_num - 1);
if (viewer->pdf_page == NULL) {
- g_warning("Page not found");
+ g_warning("page not found");
return;
}
diff --git a/src/plugins/perl/perl_gtk.c b/src/plugins/perl/perl_gtk.c
index ae6046516..be615361e 100644
--- a/src/plugins/perl/perl_gtk.c
+++ b/src/plugins/perl/perl_gtk.c
@@ -93,7 +93,7 @@ static void perl_filter_edit(GtkAction *action, gpointer callback_data)
}
else {
if (prefs_common_get_ext_editor_cmd())
- g_warning("Perl Plugin: External editor command-line is invalid: `%s'",
+ g_warning("Perl plugin: external editor command-line is invalid: `%s'",
prefs_common_get_ext_editor_cmd());
g_snprintf(buf, sizeof(buf), "emacs %s", perlfilter);
}
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index 333975242..6a48d0392 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -171,7 +171,7 @@ static void filter_log_write(gint type, gchar *text) {
log_message(LOG_PROTOCOL, " MATCH: %s\n", text?text:"<no text specified>");
break;
default:
- g_warning("Perl Plugin: Wrong use of filter_log_write");
+ g_warning("Perl plugin: wrong use of filter_log_write");
break;
}
}
@@ -565,7 +565,7 @@ static XS(XS_ClawsMail_filter_init)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::init");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::init");
XSRETURN_UNDEF;
}
flag = SvIV(ST(0));
@@ -644,7 +644,7 @@ static XS(XS_ClawsMail_filter_init)
else
XSRETURN_NO;
default:
- g_warning("Perl Plugin: Wrong argument to ClawsMail::C::init");
+ g_warning("Perl plugin: wrong argument to ClawsMail::C::init");
XSRETURN_UNDEF;
}
}
@@ -656,7 +656,7 @@ static XS(XS_ClawsMail_open_mail_file)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::open_mail_file");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::open_mail_file");
XSRETURN_UNDEF;
}
file = procmsg_get_message_file_path(msginfo);
@@ -664,7 +664,7 @@ static XS(XS_ClawsMail_open_mail_file)
XSRETURN_UNDEF;
if((message_file = claws_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "claws_fopen");
- g_warning("Perl Plugin: File open error in ClawsMail::C::open_mail_file");
+ g_warning("Perl plugin: file open error in ClawsMail::C::open_mail_file");
g_free(file);
XSRETURN_UNDEF;
}
@@ -676,7 +676,7 @@ static XS(XS_ClawsMail_close_mail_file)
{
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::close_mail_file");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::close_mail_file");
XSRETURN_UNDEF;
}
if(message_file != NULL)
@@ -692,11 +692,11 @@ static XS(XS_ClawsMail_get_next_header)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::get_next_header");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::get_next_header");
XSRETURN_EMPTY;
}
if(message_file == NULL) {
- g_warning("Perl Plugin: Message file not open. Use ClawsMail::C::open_message_file first.");
+ g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first");
XSRETURN_EMPTY;
}
if(procheader_get_one_field(&buf, message_file, NULL) != -1) {
@@ -725,11 +725,11 @@ static XS(XS_ClawsMail_get_next_body_line)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::get_next_body_line");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::get_next_body_line");
XSRETURN_UNDEF;
}
if(message_file == NULL) {
- g_warning("Perl Plugin: Message file not open. Use ClawsMail::C::open_message_file first.");
+ g_warning("Perl plugin: message file not open. Use ClawsMail::C::open_message_file first");
XSRETURN_UNDEF;
}
if(claws_fgets(buf, sizeof(buf), message_file) != NULL)
@@ -757,7 +757,7 @@ static XS(XS_ClawsMail_check_flag)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::check_flag");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::check_flag");
XSRETURN_UNDEF;
}
flag = SvIV(ST(0));
@@ -820,7 +820,7 @@ static XS(XS_ClawsMail_check_flag)
else
XSRETURN_NO;
default:
- g_warning("Perl Plugin: Unknown argument to ClawsMail::C::check_flag");
+ g_warning("Perl plugin: unknown argument to ClawsMail::C::check_flag");
XSRETURN_UNDEF;
}
}
@@ -832,7 +832,7 @@ static XS(XS_ClawsMail_colorlabel)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::colorlabel");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::colorlabel");
XSRETURN_UNDEF;
}
color = SvIV(ST(0));
@@ -853,7 +853,7 @@ static XS(XS_ClawsMail_age_greater)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::age_greater");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::age_greater");
XSRETURN_UNDEF;
}
age = SvIV(ST(0));
@@ -874,7 +874,7 @@ static XS(XS_ClawsMail_age_lower)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::age_lower");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::age_lower");
XSRETURN_UNDEF;
}
age = SvIV(ST(0));
@@ -892,7 +892,7 @@ static XS(XS_ClawsMail_tagged)
{
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::tagged");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::tagged");
XSRETURN_UNDEF;
}
@@ -908,7 +908,7 @@ static XS(XS_ClawsMail_get_tags)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::get_tags");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::get_tags");
XSRETURN_UNDEF;
}
@@ -935,14 +935,14 @@ static XS(XS_ClawsMail_set_tag)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::set_tag");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::set_tag");
XSRETURN_UNDEF;
}
tag_str = SvPV_nolen(ST(0));
tag_id = tags_get_id_for_str(tag_str);
if(tag_id == -1) {
- g_warning("Perl Plugin: set_tag requested setting of a non-existing tag");
+ g_warning("Perl plugin: set_tag requested setting of a non-existing tag");
XSRETURN_UNDEF;
}
@@ -959,14 +959,14 @@ static XS(XS_ClawsMail_unset_tag)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::unset_tag");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::unset_tag");
XSRETURN_UNDEF;
}
tag_str = SvPV_nolen(ST(0));
tag_id = tags_get_id_for_str(tag_str);
if(tag_id == -1) {
- g_warning("Perl Plugin: unset_tag requested setting of a non-existing tag");
+ g_warning("Perl plugin: unset_tag requested setting of a non-existing tag");
XSRETURN_UNDEF;
}
@@ -980,7 +980,7 @@ static XS(XS_ClawsMail_clear_tags)
{
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::clear_tags");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::clear_tags");
XSRETURN_UNDEF;
}
@@ -996,14 +996,14 @@ static XS(XS_ClawsMail_make_sure_tag_exists)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::make_sure_tag_exists");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::make_sure_tag_exists");
XSRETURN_UNDEF;
}
tag_str = SvPV_nolen(ST(0));
if(IS_NOT_RESERVED_TAG(tag_str) == FALSE) {
- g_warning("Perl Plugin: Trying to create a tag with a reserved name: %s", tag_str);
+ g_warning("Perl plugin: trying to create a tag with a reserved name: %s", tag_str);
XSRETURN_UNDEF;
}
@@ -1022,7 +1022,7 @@ static XS(XS_ClawsMail_make_sure_folder_exists)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::make_sure_folder_exists");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::make_sure_folder_exists");
XSRETURN_UNDEF;
}
@@ -1044,7 +1044,7 @@ static XS(XS_ClawsMail_addr_in_addressbook)
dXSARGS;
if(items != 1 && items != 2) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::addr_in_addressbook");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::addr_in_addressbook");
XSRETURN_UNDEF;
}
@@ -1080,7 +1080,7 @@ static XS(XS_ClawsMail_set_flag)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::set_flag");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::set_flag");
XSRETURN_UNDEF;
}
flag = SvIV(ST(0));
@@ -1102,7 +1102,7 @@ static XS(XS_ClawsMail_set_flag)
filter_log_write(LOG_ACTION,"lock");
XSRETURN_YES;
default:
- g_warning("Perl Plugin: Unknown argument to ClawsMail::C::set_flag");
+ g_warning("Perl plugin: unknown argument to ClawsMail::C::set_flag");
XSRETURN_UNDEF;
}
}
@@ -1119,7 +1119,7 @@ static XS(XS_ClawsMail_unset_flag)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::unset_flag");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::unset_flag");
XSRETURN_UNDEF;
}
flag = SvIV(ST(0));
@@ -1141,7 +1141,7 @@ static XS(XS_ClawsMail_unset_flag)
filter_log_write(LOG_ACTION,"unlock");
XSRETURN_YES;
default:
- g_warning("Perl Plugin: Unknown argument to ClawsMail::C::unset_flag");
+ g_warning("Perl plugin: unknown argument to ClawsMail::C::unset_flag");
XSRETURN_UNDEF;
}
}
@@ -1155,7 +1155,7 @@ static XS(XS_ClawsMail_move)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::move");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::move");
XSRETURN_UNDEF;
}
@@ -1163,12 +1163,12 @@ static XS(XS_ClawsMail_move)
dest_folder = folder_find_item_from_identifier(targetfolder);
if (!dest_folder) {
- g_warning("Perl Plugin: move: folder not found '%s'",
+ g_warning("Perl plugin: move: folder not found '%s'",
targetfolder ? targetfolder :"");
XSRETURN_UNDEF;
}
if (folder_item_move_msg(dest_folder, msginfo) == -1) {
- g_warning("Perl Plugin: move: could not move message");
+ g_warning("Perl plugin: move: could not move message");
XSRETURN_UNDEF;
}
stop_filtering = TRUE;
@@ -1187,19 +1187,19 @@ static XS(XS_ClawsMail_copy)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::copy");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::copy");
XSRETURN_UNDEF;
}
targetfolder = SvPV_nolen(ST(0));
dest_folder = folder_find_item_from_identifier(targetfolder);
if (!dest_folder) {
- g_warning("Perl Plugin: copy: folder not found '%s'",
+ g_warning("Perl plugin: copy: folder not found '%s'",
targetfolder ? targetfolder :"");
XSRETURN_UNDEF;
}
if (folder_item_copy_msg(dest_folder, msginfo) == -1) {
- g_warning("Perl Plugin: copy: could not copy message");
+ g_warning("Perl plugin: copy: could not copy message");
XSRETURN_UNDEF;
}
logtext = g_strconcat("copy to ", targetfolder, NULL);
@@ -1213,7 +1213,7 @@ static XS(XS_ClawsMail_delete)
{
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::delete");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::delete");
XSRETURN_UNDEF;
}
folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
@@ -1227,7 +1227,7 @@ static XS(XS_ClawsMail_hide)
{
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::hide");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::hide");
XSRETURN_UNDEF;
}
msginfo->hidden = TRUE;
@@ -1244,7 +1244,7 @@ static XS(XS_ClawsMail_color)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::color");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::color");
XSRETURN_UNDEF;
}
color = SvIV(ST(0));
@@ -1267,7 +1267,7 @@ static XS(XS_ClawsMail_change_score)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::change_score");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::change_score");
XSRETURN_UNDEF;
}
score = SvIV(ST(0));
@@ -1288,7 +1288,7 @@ static XS(XS_ClawsMail_set_score)
dXSARGS;
if(items != 1) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::set_score");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::set_score");
XSRETURN_UNDEF;
}
score = SvIV(ST(0));
@@ -1316,7 +1316,7 @@ static XS(XS_ClawsMail_forward)
dXSARGS;
if(items != 3) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::forward");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::forward");
XSRETURN_UNDEF;
}
@@ -1359,7 +1359,7 @@ static XS(XS_ClawsMail_redirect)
dXSARGS;
if(items != 2) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::redirect");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::redirect");
XSRETURN_UNDEF;
}
@@ -1399,16 +1399,16 @@ static XS(XS_ClawsMail_move_to_trash)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::move_to_trash");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::move_to_trash");
XSRETURN_UNDEF;
}
dest_folder = folder_get_default_trash();
if (!dest_folder) {
- g_warning("Perl Plugin: move_to_trash: Trash folder not found");
+ g_warning("Perl plugin: move_to_trash: Trash folder not found");
XSRETURN_UNDEF;
}
if (folder_item_move_msg(dest_folder, msginfo) == -1) {
- g_warning("Perl Plugin: move_to_trash: could not move message to trash");
+ g_warning("Perl plugin: move_to_trash: could not move message to trash");
XSRETURN_UNDEF;
}
stop_filtering = TRUE;
@@ -1423,17 +1423,17 @@ static XS(XS_ClawsMail_abort)
dXSARGS;
if(items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::abort");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::abort");
XSRETURN_UNDEF;
}
if(!manual_filtering) {
inbox_folder = folder_get_default_inbox();
if (!inbox_folder) {
- g_warning("Perl Plugin: abort: Inbox folder not found");
+ g_warning("Perl plugin: abort: inbox folder not found");
XSRETURN_UNDEF;
}
if (folder_item_move_msg(inbox_folder, msginfo) == -1) {
- g_warning("Perl Plugin: abort: Could not move message to default inbox");
+ g_warning("Perl plugin: abort: could not move message to default inbox");
XSRETURN_UNDEF;
}
filter_log_write(LOG_ACTION, "abort -- message moved to default inbox");
@@ -1455,7 +1455,7 @@ static XS(XS_ClawsMail_get_attribute_value)
dXSARGS;
if(items != 2 && items != 3) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::get_attribute_value");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::get_attribute_value");
XSRETURN_UNDEF;
}
addr = SvPV_nolen(ST(0));
@@ -1481,7 +1481,7 @@ static XS(XS_ClawsMail_filter_log)
dXSARGS;
if(items != 2) {
- g_warning("Perl Plugin: Wrong number of arguments to ClawsMail::C::filter_log");
+ g_warning("Perl plugin: wrong number of arguments to ClawsMail::C::filter_log");
XSRETURN_UNDEF;
}
type = SvPV_nolen(ST(0));
@@ -1493,7 +1493,7 @@ static XS(XS_ClawsMail_filter_log)
else if(!strcmp(type, "LOG_MATCH"))
filter_log_write(LOG_MATCH, text);
else {
- g_warning("Perl Plugin: ClawsMail::C::filter_log -- wrong first argument");
+ g_warning("Perl plugin: ClawsMail::C::filter_log -- wrong first argument");
XSRETURN_UNDEF;
}
XSRETURN_YES;
@@ -1506,7 +1506,7 @@ static XS(XS_ClawsMail_filter_log_verbosity)
dXSARGS;
if(items != 1 && items != 0) {
- g_warning("Perl Plugin: Wrong number of arguments to "
+ g_warning("Perl plugin: wrong number of arguments to "
"ClawsMail::C::filter_log_verbosity");
XSRETURN_UNDEF;
}
@@ -1622,7 +1622,7 @@ static int perl_load_file(void)
}
else {
if (prefs_common_get_ext_editor_cmd())
- g_warning("Perl Plugin: External editor command-line is invalid: `%s'",
+ g_warning("Perl plugin: External editor command-line is invalid: `%s'",
prefs_common_get_ext_editor_cmd());
g_snprintf(buf, sizeof(buf), "emacs %s", perlfilter);
}
@@ -2197,7 +2197,7 @@ static int perl_init(void)
};
if((my_perl = perl_alloc()) == NULL) {
- g_warning("Perl Plugin: Not enough memory to allocate Perl interpreter");
+ g_warning("Perl plugin: not enough memory to allocate Perl interpreter");
return -1;
}
PL_perl_destruct_level = 1;
@@ -2253,7 +2253,7 @@ static void perl_plugin_save_config(void)
PrefFile *pfile;
gchar *rcpath;
- debug_print("Saving Perl Plugin Configuration\n");
+ debug_print("Saving Perl plugin Configuration\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
pfile = prefs_write_open(rcpath);
@@ -2262,7 +2262,7 @@ static void perl_plugin_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Perl Plugin: Failed to write Perl Plugin configuration to file");
+ g_warning("failed to write Perl plugin configuration to file");
prefs_file_close_revert(pfile);
return;
}
@@ -2323,7 +2323,7 @@ gint plugin_init(gchar **error)
/* chmod for security */
if (change_file_mode_rw(fp, perlfilter) < 0) {
FILE_OP_ERROR(perlfilter, "chmod");
- g_warning("Perl Plugin: Can't change file mode");
+ g_warning("Perl plugin: can't change file mode");
}
claws_fclose(fp);
g_free(perlfilter);
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 7bfa2d96d..adba42c0c 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -251,7 +251,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
if (!warned)
alertpanel_error(_("PGP Core: Can't get key - no gpg-agent running."));
else
- g_warning("PGP Core: Can't get key - no gpg-agent running.");
+ g_warning("PGP Core: can't get key - no gpg-agent running");
warned = TRUE;
} else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) != GPG_ERR_EOF) {
return g_strdup_printf(_("The signature can't be checked - %s"),
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index c5a05fb99..35ca8f8af 100644
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -180,7 +180,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
conv_get_locale_charset_str_no_utf8());
}
if (!tmp) {
- g_warning("Can't convert charset to anything sane");
+ g_warning("can't convert charset to anything sane");
tmp = conv_codeset_strdup(textdata, CS_UTF_8, CS_US_ASCII);
}
g_free(textdata);
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 595fa92e9..e9cb47998 100644
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -71,7 +71,7 @@ static PrivacyDataPGP *pgpmime_new_privacydata()
data->is_signed = FALSE;
data->sigstatus = NULL;
if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
- g_warning("Couldn't initialize GPG context: %s", gpgme_strerror(err));
+ g_warning("couldn't initialize GPG context: %s", gpgme_strerror(err));
return NULL;
}
diff --git a/src/plugins/python/python_prefs.c b/src/plugins/python/python_prefs.c
index 9f57209aa..c4b1bd8a7 100644
--- a/src/plugins/python/python_prefs.c
+++ b/src/plugins/python/python_prefs.c
@@ -68,7 +68,7 @@ void python_prefs_done(void)
return;
if (prefs_write_param(prefs, pref_file->fp) < 0) {
- g_warning("failed to write Python Plugin configuration");
+ g_warning("failed to write Python plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index 51cb313e8..efbf7450e 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -65,14 +65,14 @@ FeedItem *rssyl_parse_folder_item_file(gchar *path)
g_file_get_contents(path, &contents, NULL, &error);
if( error ) {
- g_warning("GError: '%s'", error->message);
+ g_warning("error: '%s'", error->message);
g_error_free(error);
}
if( contents != NULL ) {
lines = strsplit_no_copy(contents, '\n');
} else {
- g_warning("Badly formatted file found, ignoring: '%s'", path);
+ g_warning("badly formatted file found, ignoring: '%s'", path);
return NULL;
}
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index d8f28eabc..8621b32c8 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -414,7 +414,7 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
template = g_strconcat(dirname, G_DIR_SEPARATOR_S,
RSSYL_TMP_TEMPLATE, NULL);
if ((fd = g_mkstemp(template)) < 0) {
- g_warning("Couldn't g_mkstemp('%s'), not adding message!", template);
+ g_warning("couldn't g_mkstemp('%s'), not adding message!", template);
g_free(dirname);
g_free(template);
return;
@@ -422,7 +422,7 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
f = claws_fdopen(fd, "w");
if (f == NULL) {
- g_warning("Couldn't open file '%s', not adding message!", template);
+ g_warning("couldn't open file '%s', not adding message!", template);
g_free(dirname);
g_free(template);
return;
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index dd344d558..3cc5325fb 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -108,14 +108,14 @@ void rssyl_deleted_update(RFolderItem *ritem)
g_file_get_contents(deleted_file, &contents, NULL, &error);
if (error) {
- g_warning("GError: '%s'", error->message);
+ g_warning("error: '%s'", error->message);
g_error_free(error);
}
if (contents != NULL) {
lines = strsplit_no_copy(contents, '\n');
} else {
- g_warning("Couldn't read '%s', ignoring", deleted_file);
+ g_warning("couldn't read '%s', ignoring", deleted_file);
g_free(deleted_file);
return;
}
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index e2b937947..e25dba014 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -55,6 +55,8 @@ static PrefParam param[] = {
P_BOOL, NULL, NULL, NULL },
{ "refresh_enabled", "TRUE", &rssyl_prefs.refresh_enabled,
P_BOOL, NULL, NULL, NULL },
+ { "refresh_all_skips", "FALSE", &rssyl_prefs.refresh_all_skips,
+ P_BOOL, NULL, NULL, NULL },
{ "cookies_path", "", &rssyl_prefs.cookies_path,
P_STRING, NULL, NULL, NULL },
{ "ssl_verify_peer", "TRUE", &rssyl_prefs.ssl_verify_peer,
@@ -113,7 +115,7 @@ rssyl_prefs_cookies_browse_cb(GtkWidget* widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("rssyl_prefs_cookies_browse_cb(): failed to convert character set.");
+ g_warning("rssyl_prefs_cookies_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(dest), utf8_filename);
@@ -129,6 +131,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
GtkWidget *refresh, *refresh_enabled, *refresh_hbox;
GtkWidget *label;
GtkWidget *refresh_on_startup;
+ GtkWidget *refresh_all_skips;
GtkAdjustment *refresh_adj;
GtkWidget *cookies_path, *cookies_btn, *cookies_hbox;
GtkWidget *ssl_verify_peer;
@@ -163,6 +166,13 @@ static void create_rssyl_prefs_page(PrefsPage *page,
rssyl_prefs.refresh_on_startup);
gtk_box_pack_start(GTK_BOX(vbox1), refresh_on_startup, FALSE, FALSE, 0);
+ /* Whether refresh-all will skip feeds that are not programmed to be periodically refreshed or not */
+ refresh_all_skips = gtk_check_button_new_with_label(
+ _("Refresh all skips feeds programmed to be refreshed manually"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(refresh_all_skips),
+ rssyl_prefs.refresh_all_skips);
+ gtk_box_pack_start(GTK_BOX(vbox1), refresh_all_skips, FALSE, FALSE, 0);
+
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
/* Whether to verify SSL peer certificate */
@@ -207,6 +217,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
prefs_page->refresh_enabled = refresh_enabled;
prefs_page->refresh = refresh;
prefs_page->refresh_on_startup = refresh_on_startup;
+ prefs_page->refresh_all_skips = refresh_all_skips;
prefs_page->cookies_path = cookies_path;
prefs_page->ssl_verify_peer = ssl_verify_peer;
}
@@ -230,6 +241,8 @@ static void save_rssyl_prefs(PrefsPage *page)
GTK_SPIN_BUTTON(prefs_page->refresh));
rssyl_prefs.refresh_on_startup = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(prefs_page->refresh_on_startup));
+ rssyl_prefs.refresh_all_skips = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(prefs_page->refresh_all_skips));
g_free(rssyl_prefs.cookies_path);
rssyl_prefs.cookies_path = g_strdup(gtk_entry_get_text(
GTK_ENTRY(prefs_page->cookies_path)));
@@ -244,7 +257,7 @@ static void save_rssyl_prefs(PrefsPage *page)
return;
if( prefs_write_param(param, pref_file->fp) < 0 ) {
- g_warning("Failed to write RSSyl plugin configuration");
+ g_warning("failed to write RSSyl plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/rssyl/rssyl_prefs.h b/src/plugins/rssyl/rssyl_prefs.h
index 5e746f038..4f12647cb 100644
--- a/src/plugins/rssyl/rssyl_prefs.h
+++ b/src/plugins/rssyl/rssyl_prefs.h
@@ -33,6 +33,7 @@ struct _RPrefs {
gboolean refresh_enabled;
gint refresh;
gboolean refresh_on_startup;
+ gboolean refresh_all_skips;
gchar *cookies_path;
gboolean ssl_verify_peer;
};
@@ -44,6 +45,7 @@ struct _RPrefsPage {
GtkWidget *refresh_enabled;
GtkWidget *refresh;
GtkWidget *refresh_on_startup;
+ GtkWidget *refresh_all_skips;
GtkWidget *cookies_path;
GtkWidget *ssl_verify_peer;
};
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index bd4ead851..c65d21ac9 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -317,8 +317,13 @@ static gboolean rssyl_update_recursively_func(GNode *node, gpointer data)
ritem = (RFolderItem *)item;
if( ritem->url != NULL ) {
- debug_print("RSSyl: Updating feed '%s'\n", item->name);
- rssyl_update_feed(ritem, 0);
+ if(rssyl_prefs_get()->refresh_all_skips &&
+ (ritem->default_refresh_interval == FALSE) && (ritem->refresh_interval == 0)) {
+ debug_print("RSSyl: Skipping feed '%s'\n", item->name);
+ } else {
+ debug_print("RSSyl: Updating feed '%s'\n", item->name);
+ rssyl_update_feed(ritem, 0);
+ }
} else
debug_print("RSSyl: Updating in folder '%s'\n", item->name);
diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c
index 352f3574a..8b5e9d78e 100644
--- a/src/plugins/spam_report/spam_report.c
+++ b/src/plugins/spam_report/spam_report.c
@@ -287,7 +287,7 @@ static void report_spam(gint id, ReportInterface *intf, MsgInfo *msginfo, gchar
}
break;
default:
- g_warning("Unknown method");
+ g_warning("unknown method");
}
g_free(reqbody);
g_free(geturl);
diff --git a/src/plugins/spam_report/spam_report_prefs.c b/src/plugins/spam_report/spam_report_prefs.c
index 1b9557adc..b4d9f9409 100644
--- a/src/plugins/spam_report/spam_report_prefs.c
+++ b/src/plugins/spam_report/spam_report_prefs.c
@@ -230,7 +230,7 @@ static void save_spamreport_prefs(PrefsPage *page)
return;
if (prefs_write_param(param, pref_file->fp) < 0) {
- g_warning("failed to write SpamReport Plugin configuration");
+ g_warning("failed to write SpamReport plugin configuration");
prefs_file_close_revert(pref_file);
return;
}
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index eacf94053..8409b7adf 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -511,7 +511,7 @@ void spamassassin_save_config(void)
return;
if (prefs_write_param(param, pfile->fp) < 0) {
- g_warning("Failed to write SpamAssassin configuration to file");
+ g_warning("failed to write SpamAssassin configuration to file");
prefs_file_close_revert(pfile);
return;
}
@@ -651,7 +651,7 @@ void spamassassin_register_hook(void)
if (hook_id == HOOK_NONE)
hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
if (hook_id == HOOK_NONE) {
- g_warning("Failed to register mail filtering hook");
+ g_warning("failed to register mail filtering hook");
config.process_emails = FALSE;
}
}
diff --git a/src/plugins/tnef_parse/tnef_parse.c b/src/plugins/tnef_parse/tnef_parse.c
index 92c629215..9f2b18e59 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -317,7 +317,7 @@ static gboolean tnef_parse (MimeParser *parser, MimeInfo *mimeinfo)
g_strdup("Parsed from MS-TNEF"));
if (parse_result != 0) {
- g_warning("Failed to parse TNEF data.");
+ g_warning("failed to parse TNEF data");
TNEFFree(tnef);
return FALSE;
}
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 06e7a2508..ddf255cb2 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1745,7 +1745,7 @@ gboolean vcal_curl_put(gchar *url, FILE *fp, gint filesize, const gchar *user, c
curl_easy_getinfo(curl_ctx, CURLINFO_RESPONSE_CODE, &response_code);
if (response_code < 200 || response_code >= 300) {
- g_warning("Can't export calendar, got code %ld", response_code);
+ g_warning("can't export calendar, got code %ld", response_code);
res = FALSE;
}
curl_easy_cleanup(curl_ctx);
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index b93d91ce7..c851cf636 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -354,7 +354,7 @@ gchar *vcal_manager_event_dump(VCalEvent *event, gboolean is_reply, gboolean is_
);
if (!calendar) {
- g_warning ("can't generate calendar");
+ g_warning("can't generate calendar");
g_free(organizer);
g_free(tmpfile);
g_free(attendee);
@@ -386,7 +386,7 @@ gchar *vcal_manager_event_dump(VCalEvent *event, gboolean is_reply, gboolean is_
ICAL_VEVENT_COMPONENT, (void*)0);
if (!ievent) {
- g_warning ("can't generate event");
+ g_warning("can't generate event");
g_free(organizer);
g_free(tmpfile);
g_free(attendee);
@@ -709,7 +709,7 @@ gchar *vcal_manager_icalevent_dump(icalcomponent *event, gchar *orga, icalcompon
);
if (!calendar) {
- g_warning ("can't generate calendar");
+ g_warning("can't generate calendar");
g_free(tmpfile);
icalcomponent_free(ievent);
return NULL;
@@ -978,7 +978,7 @@ void vcal_manager_save_event (VCalEvent *event, gboolean export_after)
xml_free_tree(rootnode);
if (prefs_file_close(pfile) < 0) {
- g_warning("failed to write event.");
+ g_warning("failed to write event");
return;
}
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 7391bbb94..a71410bee 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -227,7 +227,7 @@ static gchar *get_tmpfile(VCalViewer *vcalviewer)
debug_print("creating %s\n", tmpfile);
if (procmime_get_part(tmpfile, vcalviewer->mimeinfo) < 0) {
- g_warning("Can't get mimepart file");
+ g_warning("can't get mimepart file");
g_free(tmpfile);
return NULL;
}
diff --git a/src/prefs_account.c b/src/prefs_account.c
index f5570e053..7a9de7275 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -4831,7 +4831,7 @@ static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("prefs_account_signature_browse_cb(): failed to convert character set.");
+ g_warning("prefs_account_signature_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(entry_sigpath), utf8_filename);
@@ -4849,7 +4849,7 @@ static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("prefs_account_cert_browse_cb(): failed to convert character set.");
+ g_warning("prefs_account_cert_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(entry_in_cert_file), utf8_filename);
@@ -4866,7 +4866,7 @@ static void prefs_account_out_cert_browse_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("prefs_account_cert_browse_cb(): failed to convert character set.");
+ g_warning("prefs_account_cert_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(GTK_ENTRY(entry_out_cert_file), utf8_filename);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index e6bcf581e..2bdcadefc 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -480,7 +480,7 @@ void prefs_actions_read_config(void)
tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
if (!tmp) {
- g_warning("Failed to convert character set of action configuration");
+ g_warning("failed to convert character set of action configuration");
tmp = g_strdup(buf);
}
@@ -520,7 +520,7 @@ void prefs_actions_write_config(void)
act = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
if (!act) {
- g_warning("Failed to convert character set of action configuration");
+ g_warning("failed to convert character set of action configuration");
act = g_strdup(act);
}
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index c3e5edca4..c9fdc8a8b 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -377,7 +377,7 @@ FolderColumnState *prefs_folder_column_get_config(void)
pos = prefs_common.folder_col_pos[type];
if (pos < 0 || pos >= N_FOLDER_COLS ||
state[pos].type != -1) {
- g_warning("Wrong column position");
+ g_warning("wrong column position");
prefs_folder_column_set_config(default_state);
return default_state;
}
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index aaf0dab2c..ccd34c64f 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -82,7 +82,7 @@ void prefs_read_config(PrefParam *param, const gchar *label,
cm_return_if_fail(rcfile != NULL);
if (encoding != NULL)
- g_warning("Encoding is ignored");
+ g_warning("encoding is ignored");
debug_print("Reading configuration...\n");
@@ -180,7 +180,7 @@ static void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
tmp = g_strdup("");
}
if (!tmp) {
- g_warning("Failed to convert character set.");
+ g_warning("failed to convert character set");
tmp = g_strdup(value);
}
g_free(*((gchar **)param[i].data));
@@ -220,7 +220,7 @@ static void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
#define TRY(func) \
if (!(func)) \
{ \
- g_warning("Failed to write configuration to file"); \
+ g_warning("failed to write configuration to file"); \
if (orig_fp) claws_fclose(orig_fp); \
prefs_file_close_revert(pfile); \
g_free(rcpath); \
@@ -248,7 +248,7 @@ void prefs_write_config(PrefParam *param, const gchar *label,
}
if ((pfile = prefs_write_open(rcpath)) == NULL) {
- g_warning("Failed to write configuration to file");
+ g_warning("failed to write configuration to file");
if (orig_fp) claws_fclose(orig_fp);
g_free(rcpath);
return;
@@ -304,7 +304,7 @@ void prefs_write_config(PrefParam *param, const gchar *label,
if (orig_fp) claws_fclose(orig_fp);
if (prefs_file_close(pfile) < 0)
- g_warning("Failed to write configuration to file");
+ g_warning("failed to write configuration to file");
g_free(rcpath);
debug_print("Configuration is saved.\n");
@@ -406,7 +406,7 @@ void prefs_set_default(PrefParam *param)
CS_INTERNAL)
: g_strdup("");
if (!tmp) {
- g_warning("Failed to convert character set.");
+ g_warning("failed to convert character set");
tmp = g_strdup(envstr);
}
*((gchar **)param[i].data) = tmp;
@@ -640,7 +640,7 @@ void prefs_set_data_from_entry(PrefParam *pparam)
*((gint *)pparam->data) = atoi(entry_str);
break;
default:
- g_warning("Invalid PrefType for GtkEntry widget: %d",
+ g_warning("invalid PrefType for GtkEntry widget: %d",
pparam->type);
}
}
@@ -658,7 +658,7 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
*str = pref_get_pref_from_entry(GTK_ENTRY(*pparam->widget));
break;
default:
- g_warning("Invalid escaped PrefType for GtkEntry widget: %d",
+ g_warning("invalid escaped PrefType for GtkEntry widget: %d",
pparam->type);
}
}
@@ -683,7 +683,7 @@ void prefs_set_entry(PrefParam *pparam)
itos(*((gushort *)pparam->data)));
break;
default:
- g_warning("Invalid PrefType for GtkEntry widget: %d",
+ g_warning("invalid PrefType for GtkEntry widget: %d",
pparam->type);
}
}
@@ -701,7 +701,7 @@ void prefs_set_entry_from_escaped(PrefParam *pparam)
*str ? *str : "");
break;
default:
- g_warning("Invalid escaped PrefType for GtkEntry widget: %d",
+ g_warning("invalid escaped PrefType for GtkEntry widget: %d",
pparam->type);
}
}
@@ -753,7 +753,7 @@ void prefs_set_data_from_text(PrefParam *pparam)
g_free(text);
break;
default:
- g_warning("Invalid PrefType for GtkText widget: %d",
+ g_warning("invalid PrefType for GtkText widget: %d",
pparam->type);
}
}
@@ -771,7 +771,7 @@ void prefs_set_escaped_data_from_text(PrefParam *pparam)
*str = pref_get_pref_from_textview(GTK_TEXT_VIEW(*pparam->widget));
break;
default:
- g_warning("Invalid escaped PrefType for GtkText widget: %d",
+ g_warning("invalid escaped PrefType for GtkText widget: %d",
pparam->type);
}
}
@@ -813,7 +813,7 @@ void prefs_set_text(PrefParam *pparam)
gtk_text_buffer_insert(buffer, &iter, buf, -1);
break;
default:
- g_warning("Invalid PrefType for GtkTextView widget: %d",
+ g_warning("invalid PrefType for GtkTextView widget: %d",
pparam->type);
}
}
@@ -831,7 +831,7 @@ void prefs_set_text_from_escaped(PrefParam *pparam)
*str ? *str : "");
break;
default:
- g_warning("Invalid escaped PrefType for GtkTextView widget: %d",
+ g_warning("invalid escaped PrefType for GtkTextView widget: %d",
pparam->type);
}
}
@@ -870,7 +870,7 @@ void prefs_set_data_from_spinbtn(PrefParam *pparam)
(GTK_SPIN_BUTTON(*pparam->widget));
break;
default:
- g_warning("Invalid PrefType for GtkSpinButton widget: %d",
+ g_warning("invalid PrefType for GtkSpinButton widget: %d",
pparam->type);
}
}
@@ -889,7 +889,7 @@ void prefs_set_spinbtn(PrefParam *pparam)
(gfloat)*((gushort *)pparam->data));
break;
default:
- g_warning("Invalid PrefType for GtkSpinButton widget: %d",
+ g_warning("invalid PrefType for GtkSpinButton widget: %d",
pparam->type);
}
}
@@ -1059,7 +1059,7 @@ static gboolean prefs_read_config_from_cache(PrefParam *param, const gchar *labe
sections_table = g_hash_table_lookup(whole_cache, rcfile);
if (sections_table == NULL) {
- g_warning("Can't find %s in the whole cache", rcfile?rcfile:"(null)");
+ g_warning("can't find %s in the whole cache", rcfile?rcfile:"(null)");
return FALSE;
}
values_table = g_hash_table_lookup(sections_table, label);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 65500d6f8..173f6206c 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -392,7 +392,7 @@ SummaryColumnState *prefs_summary_column_get_config(void)
pos = prefs_common.summary_col_pos[type];
if (pos < 0 || pos >= N_SUMMARY_COLS ||
state[pos].type != -1) {
- g_warning("Wrong column position");
+ g_warning("wrong column position");
prefs_summary_column_set_config(default_state);
return default_state;
}
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 90dfc93ef..39474fb2d 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -242,7 +242,7 @@ static void prefs_themes_file_remove(const gchar *filename, gpointer data)
base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
if (strcmp(base, ".") != 0 && strcmp(base, "..") != 0)
- g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.",
+ g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'",
base);
}
else if (0 != claws_unlink(filename)) {
@@ -262,7 +262,7 @@ static void prefs_themes_file_install(const gchar *filename, gpointer data)
base = g_path_get_basename(filename);
if (TRUE == is_dir_exist(filename)) {
if (strcmp(base, ".") != 0 && strcmp(base, "..") !=0 )
- g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'.",
+ g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'",
base);
}
else {
diff --git a/src/procheader.c b/src/procheader.c
index 864651af7..a1fb53092 100644
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -1064,7 +1064,7 @@ gboolean procheader_date_parse_to_tm(const gchar *src, struct tm *t, char *zone)
if (procheader_scan_date_string(src, weekday, &day, month, &year,
&hh, &mm, &ss, zone) < 0) {
- g_warning("Invalid date: %s", src);
+ g_warning("invalid date: %s", src);
return FALSE;
}
@@ -1080,7 +1080,7 @@ gboolean procheader_date_parse_to_tm(const gchar *src, struct tm *t, char *zone)
if ((p = strstr(monthstr, month)) != NULL)
dmonth = (gint)(p - monthstr) / 3 + 1;
else {
- g_warning("Invalid month: %s", month);
+ g_warning("invalid month: %s", month);
dmonth = G_DATE_BAD_MONTH;
}
diff --git a/src/procmime.c b/src/procmime.c
index f4b9bbe8e..572a4c877 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -398,7 +398,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
}
starting = FALSE;
if (((inread != inlen) || len < 0) && !got_error) {
- g_warning("Bad BASE64 content.");
+ g_warning("bad BASE64 content");
if (claws_fwrite(_("[Error decoding BASE64]\n"),
sizeof(gchar),
strlen(_("[Error decoding BASE64]\n")),
@@ -445,7 +445,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
len = fromuutobits(outbuf, buf);
if (len <= 0) {
if (len < 0)
- g_warning("Bad UUENCODE content (%d)", len);
+ g_warning("bad UUENCODE content (%d)", len);
break;
}
if (claws_fwrite(outbuf, sizeof(gchar), len, outfp) < len)
@@ -524,7 +524,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
if (mimeinfo->content == MIMECONTENT_FILE && mimeinfo->data.filename) {
if ((infp = claws_fopen(mimeinfo->data.filename, "rb")) == NULL) {
- g_warning("Can't open file %s", mimeinfo->data.filename);
+ g_warning("can't open file %s", mimeinfo->data.filename);
claws_fclose(outfp);
return FALSE;
}
@@ -536,7 +536,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
}
} else {
claws_fclose(outfp);
- g_warning("Unknown mimeinfo");
+ g_warning("unknown mimeinfo");
return FALSE;
}
@@ -756,7 +756,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
#else
tmpfile = procmime_get_tmp_file_name(mimeinfo);
if (tmpfile == NULL) {
- g_warning("no filename\n");
+ g_warning("no filename");
return TRUE;
}
@@ -770,7 +770,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
}
if ((r = procmime_get_part_to_stream(tmpfp, mimeinfo)) < 0) {
- g_warning("procmime_get_part_to_stream error %d\n", r);
+ g_warning("procmime_get_part_to_stream error %d", r);
g_free(tmpfile);
return TRUE;
}
@@ -833,7 +833,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
}
if (conv_fail)
- g_warning("procmime_get_text_content(): Code conversion failed.");
+ g_warning("procmime_get_text_content(): code conversion failed");
claws_fclose(tmpfp);
@@ -892,7 +892,7 @@ FILE *procmime_get_binary_content(MimeInfo *mimeinfo)
#else
tmpfile = procmime_get_tmp_file_name(mimeinfo);
if (tmpfile == NULL) {
- g_warning("no filename\n");
+ g_warning("no filename");
return TRUE;
}
@@ -1251,7 +1251,7 @@ GList *procmime_get_mime_type_list(void)
claws_fclose(fp);
if (!list)
- g_warning("Can't read mime.types");
+ g_warning("can't read mime.types");
return list;
}
@@ -2742,7 +2742,7 @@ void *procmime_get_part_as_string(MimeInfo *mimeinfo,
data = g_malloc(null_terminate ? length + 1 : length);
if (data == NULL) {
- g_warning("Could not allocate %d bytes for procmime_get_part_as_string.\n",
+ g_warning("could not allocate %d bytes for procmime_get_part_as_string",
(null_terminate ? length + 1 : length));
claws_fclose(infp);
return NULL;
diff --git a/src/procmsg.c b/src/procmsg.c
index fdc8017d0..d806604e1 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -906,6 +906,7 @@ parse_again:
if (orig && g_slist_length(orig)) {
if (!last_account && nothing_to_sort) {
/* can't find an account for the rest of the list */
+fprintf(stderr, "==> 1220858 logically dead code\n");
cur = orig;
while (cur) {
result = g_slist_append(result, cur->data);
@@ -1021,7 +1022,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
if (procmsg_send_message_queue_full(file,
!procmsg_is_last_for_account(queue, msginfo, elem),
errstr, queue, msginfo->msgnum, &queued_removed) < 0) {
- g_warning("Sending queued message %d failed.",
+ g_warning("sending queued message %d failed",
msginfo->msgnum);
err++;
} else {
@@ -1326,7 +1327,7 @@ MsgInfo *procmsg_msginfo_get_full_info_from_file(MsgInfo *msginfo, const gchar *
if (msginfo == NULL) return NULL;
if (!file || !is_file_exist(file)) {
- g_warning("procmsg_msginfo_get_full_info_from_file(): can't get message file.");
+ g_warning("procmsg_msginfo_get_full_info_from_file(): can't get message file");
return NULL;
}
@@ -1391,7 +1392,7 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
file = procmsg_get_message_file(msginfo);
}
if (!file || !is_file_exist(file)) {
- g_warning("procmsg_msginfo_get_full_info(): can't get message file.");
+ g_warning("procmsg_msginfo_get_full_info(): can't get message file");
return NULL;
}
@@ -1663,8 +1664,8 @@ send_mail:
if (!mailac) {
mailac = account_find_from_smtp_server(from, smtpserver);
if (!mailac) {
- g_warning("Account not found. "
- "Using current account...");
+ g_warning("account not found, "
+ "using current account...");
mailac = cur_account;
}
}
@@ -1678,7 +1679,7 @@ send_mail:
} else {
PrefsAccount tmp_ac;
- g_warning("Account not found.");
+ g_warning("account not found");
memset(&tmp_ac, 0, sizeof(PrefsAccount));
tmp_ac.address = from;
@@ -2391,7 +2392,7 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
tmp_msginfo->folder = src_msginfo->folder;
tmp_msginfo->plaintext_file = g_strdup(tmpfile);
} else {
- g_warning("procmsg_msginfo_new_from_mimeinfo(): Can't generate new msginfo");
+ g_warning("procmsg_msginfo_new_from_mimeinfo(): can't generate new msginfo");
}
g_free(tmpfile);
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index d8226feae..60afe0989 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -97,7 +97,7 @@ static void remove_visibility(void)
{
stacksize--;
if (stacksize < 0) {
- g_warning("Error: visibility stack underflow");
+ g_warning("error: visibility stack underflow");
stacksize = 0;
}
}
@@ -134,7 +134,7 @@ static void clear_buffer(void)
gchar *quote_fmt_get_buffer(void)
{
if (current != &main_expr)
- g_warning("Error: parser still in sub-expr mode");
+ g_warning("error: parser still in sub-expr mode");
if (error != 0)
return NULL;
@@ -234,7 +234,7 @@ void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
void quote_fmterror(char *str)
{
- g_warning("Error: %s at line %d", str, line);
+ g_warning("error: %s at line %d", str, line);
error = 1;
}
@@ -486,7 +486,7 @@ static void quote_fmt_show_msg(MsgInfo *msginfo, const gchar *body,
}
if (fp == NULL)
- g_warning("Can't get text part");
+ g_warning("can't get text part");
else {
account_sigsep_matchlist_create();
while (fgets(buf, sizeof(buf), fp) != NULL) {
diff --git a/src/setup.c b/src/setup.c
index 8fd2be8b5..bd1c9b711 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -44,7 +44,7 @@ gboolean setup_write_mailbox_path(MainWindow *mainwin, const gchar *path)
if (!path) return FALSE;
if (folder_find_from_path(path)) {
- g_warning("The mailbox already exists.");
+ g_warning("the mailbox already exists");
return FALSE;
}
diff --git a/src/summaryview.c b/src/summaryview.c
index 4387d8057..d75d2f63a 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4990,7 +4990,7 @@ void summary_save_as(SummaryView *summaryview)
conv_get_locale_charset_str(),
CS_UTF_8);
if (!converted_filename) {
- g_warning("summary_save_as(): failed to convert character set.");
+ g_warning("summary_save_as(): failed to convert character set");
} else {
g_free(filename);
filename = converted_filename;
diff --git a/src/textview.c b/src/textview.c
index 1c148860d..e237776e1 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -701,7 +701,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
pixbuf = procmime_get_part_as_pixbuf(mimeinfo, &error);
if (error != NULL) {
- g_warning("Can't load the image: %s\n", error->message);
+ g_warning("can't load the image: %s", error->message);
g_error_free(error);
END_TIMING();
return;
@@ -2050,7 +2050,7 @@ static void textview_save_contact_pic(TextView *textview)
if (!is_file_exist(filename)) {
gdk_pixbuf_save(picture, filename, "png", &error, NULL);
if (error) {
- g_warning("Failed to save image: %s",
+ g_warning("failed to save image: %s",
error->message);
g_error_free(error);
}
diff --git a/src/toolbar.c b/src/toolbar.c
index 40d59a23b..9bf11381b 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -474,7 +474,7 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source, gboolean *rewr
}
}
if ((item->index == -1) && !rewrite)
- g_warning("toolbar_parse_item: unrecognized action name '%s'\n", value);
+ g_warning("toolbar_parse_item: unrecognized action name '%s'", value);
attr = g_list_next(attr);
}
@@ -906,7 +906,7 @@ static void toolbar_action_execute(GtkWidget *widget,
if (i != -1)
actions_execute(data, i, widget, source);
else
- g_warning ("Error: did not find Claws Action to execute");
+ g_warning("error: did not find Action to execute");
}
gboolean toolbar_check_action_btns(ToolbarType type)
diff --git a/src/wizard.c b/src/wizard.c
index a4c05577b..8dd84e7aa 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1065,7 +1065,7 @@ static void cert_browse_cb(GtkWidget *widget, gpointer data)
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
if (!utf8_filename) {
- g_warning("cert_browse_cb(): failed to convert character set.");
+ g_warning("cert_browse_cb(): failed to convert character set");
utf8_filename = g_strdup(filename);
}
gtk_entry_set_text(dest, utf8_filename);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list