[Commits] [SCM] claws branch, master, updated. 3.13.2-214-gadf0072

mones at claws-mail.org mones at claws-mail.org
Fri Jul 29 00:59:44 CEST 2016


The branch, master has been updated
       via  adf00727b0c28dc7b02bd36283b54cac6b2b555b (commit)
      from  ce7c6f57c60fd0a36623c426807c3bc9fb3f492a (commit)

Summary of changes:
 src/avatars.c                             |    4 ++--
 src/compose.c                             |    5 ++---
 src/editaddress.c                         |    7 +++----
 src/etpan/imap-thread.c                   |    5 ++---
 src/etpan/nntp-thread.c                   |    5 ++---
 src/gtk/gtkutils.c                        |    4 ++--
 src/imap.c                                |    2 +-
 src/main.c                                |    4 ++--
 src/mainwindow.c                          |    6 +++---
 src/plugins/gdata/cm_gdata_contacts.c     |    4 ++--
 src/plugins/libravatar/libravatar_prefs.c |    6 +++---
 src/plugins/pgpcore/passphrase.c          |   11 +++++------
 src/plugins/pgpcore/select-keys.c         |   11 +++++------
 src/plugins/pgpcore/sgpgme.c              |    8 ++++----
 src/plugins/pgpinline/pgpinline.c         |   12 ++++++------
 src/plugins/pgpmime/pgpmime.c             |   10 +++++-----
 src/plugins/smime/smime.c                 |    8 +++-----
 src/plugins/vcalendar/vcal_dbus.c         |    2 +-
 src/procmime.c                            |    7 +++----
 src/summaryview.c                         |   24 ++++++++++++------------
 20 files changed, 68 insertions(+), 77 deletions(-)


- Log -----------------------------------------------------------------
commit adf00727b0c28dc7b02bd36283b54cac6b2b555b
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Jul 29 00:59:11 2016 +0200

    Fix some debug messages and update headers

diff --git a/src/avatars.c b/src/avatars.c
index 2a167e9..ce03cdc 100644
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014 Ricardo Mones and the Claws Mail team
+ * Copyright (C) 2014-2016 Ricardo Mones and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
 	gchar *aface;
 
 	if (!(prefs_common.enable_avatars & AVATARS_ENABLE_RENDER)) {
-		debug_print("Internal rendering of avatars is disabled");
+		debug_print("Internal rendering of avatars is disabled\n");
 		return FALSE;
 	}
 
diff --git a/src/compose.c b/src/compose.c
index c702b90..498c560 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -6310,7 +6309,7 @@ static gchar *compose_quote_list_of_addresses(gchar *str)
 				faddr = g_strconcat(name, addr, NULL);
 				g_free(name);
 				g_free(addr);
-				debug_print("new auto-quoted address: '%s'", faddr);
+				debug_print("new auto-quoted address: '%s'\n", faddr);
 			}
 		}
 		if (result == NULL)
diff --git a/src/editaddress.c b/src/editaddress.c
index da748ae..22572b1 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1692,7 +1691,7 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_fo
 			if (is_file_exist(filename)) {
 				pixbuf = gdk_pixbuf_new_from_file(filename, &error);
 				if (error) {
-					debug_print("Failed to import image: \n%s",
+					debug_print("Failed to import image: %s\n",
 							error->message);
 					g_error_free(error);
 					goto no_img;
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 76223c4..6af12b1 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -333,7 +332,7 @@ void imap_done(Folder * folder)
 	
 	chash_delete(imap_hash, &key, NULL);
 	
-	debug_print("remove thread");
+	debug_print("remove thread\n");
 }
 
 static struct etpan_thread * get_thread(Folder * folder)
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
index c208028..8ebce0d 100644
--- a/src/etpan/nntp-thread.c
+++ b/src/etpan/nntp-thread.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2012 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -210,7 +209,7 @@ void nntp_done(Folder * folder)
 	
 	chash_delete(nntp_hash, &key, NULL);
 	
-	debug_print("remove thread");
+	debug_print("remove thread\n");
 }
 
 static struct etpan_thread * get_thread(Folder * folder)
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index c2a051b..15503f8 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1061,13 +1061,13 @@ gboolean get_tag_range(GtkTextIter *iter,
 
 	_end_iter = *iter;
 	if (!gtk_text_iter_forward_to_tag_toggle(&_end_iter, tag)) {
-		debug_print("Can't find end");
+		debug_print("Can't find end.\n");
 		return FALSE;
 	}
 
 	_start_iter = _end_iter;
 	if (!gtk_text_iter_backward_to_tag_toggle(&_start_iter, tag)) {
-		debug_print("Can't find start.");
+		debug_print("Can't find start.\n");
 		return FALSE;
 	}
 
diff --git a/src/imap.c b/src/imap.c
index 0966ed6..a715eae 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -3730,7 +3730,7 @@ static void imap_delete_all_cached_messages(FolderItem *item)
 		remove_all_numbered_files(dir);
 	g_free(dir);
 
-	debug_print("done.\n");
+	debug_print("Deleting all cached messages done.\n");
 }
 
 gchar imap_get_path_separator_for_item(FolderItem *item)
diff --git a/src/main.c b/src/main.c
index 747b7d2..689eac0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -463,8 +463,8 @@ static int migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
 		if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
 			err |= (fputs(buf, newfp) == EOF);
 		} else {
-			debug_print("->replacing %s", buf);
-			debug_print("  with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
+			debug_print("->replacing %s\n", buf);
+			debug_print("  with %s%s\n", new_plugin_path, buf+strlen(old_plugin_path));
 			err |= (fputs(new_plugin_path, newfp) == EOF);
 			err |= (fputs(buf+strlen(old_plugin_path), newfp) == EOF);
 		}
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2dc592f..63aca15 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-   Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -3667,7 +3667,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 	GtkWidget *vpaned;
 	GtkWidget *vbox_body = mainwin->vbox_body;
 	gboolean first_set = (mainwin->hpaned == NULL);
-	debug_print("Setting widgets... ");
+	debug_print("Setting widgets...\n");
 
 #ifndef GENERIC_UMPC
 	mainwin->messageview->statusbar = mainwin->statusbar;
@@ -3872,7 +3872,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 			 mainwin);
 	}
 
-	debug_print("done.\n");
+	debug_print("Setting widgets done.\n");
 }
 
 void main_window_destroy_all(void)
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index a7c1e0f..056b8f1 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -1,6 +1,6 @@
 /* GData plugin for Claws-Mail
  * Copyright (C) 2011 Holger Berndt
- * Copyright (C) 2011-2015 the Claws Mail team
+ * Copyright (C) 2011-2016 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -526,7 +526,7 @@ static void query()
 
   if(cm_gdata_contacts_query_running)
   {
-    debug_print("GData plugin: Network query already in progress");
+    debug_print("GData plugin: Network query already in progress\n");
     return;
   }
 
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index 86f8732..c70305a 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014-2015 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2014-2016 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -168,11 +168,11 @@ static void cache_clean_button_clicked_cb(GtkButton *button, gpointer data)
 	if (val != G_ALERTALTERNATE)
 		return;
 
-	debug_print("cleaning missing cache");
+	debug_print("cleaning missing cache\n");
 	misses = g_hash_table_size(libravatarmisses);
 	g_hash_table_remove_all(libravatarmisses);
 
-	debug_print("cleaning disk cache");
+	debug_print("cleaning disk cache\n");
 	acr = libravatar_cache_clean();
 	if (acr == NULL) {
 		alertpanel_error(_("Not enough memory for operation"));
diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 4bf4243..3eff708 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -1,5 +1,5 @@
 /* passphrase.c - GTK+ based passphrase callback
- *      Copyright (C) 2001-2013 Werner Koch (dd9jn) and the Claws Mail team
+ * Copyright (C) 2001-2016 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -310,13 +309,13 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
         pass = g_strdup(last_pass);
     else {
 	gpgmegtk_set_passphrase_grab (prefs_gpg_get_config()->passphrase_grab);
-	debug_print ("%% requesting passphrase for '%s'\n ", uid_hint);
+	debug_print ("%% requesting passphrase for '%s'\n", uid_hint);
 	pass = passphrase_mbox (uid_hint, passphrase_hint, prev_bad, FALSE);
 	gpgmegtk_free_passphrase();
 	if (!pass) {
             debug_print ("%% cancel passphrase entry\n");
             if (write(fd, "\n", 1) != 1)
-		debug_print("short write");
+				debug_print("short write\n");
 
             return GPG_ERR_CANCELED;
 	}
@@ -346,10 +345,10 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
     }
 #else
     if (write(fd, pass, strlen(pass)) != strlen(pass))
-	debug_print("Short write");
+		debug_print("short write\n");
 
     if (write(fd, "\n", 1) != 1)
-	debug_print("Short write");
+		debug_print("short write\n");
 #endif
     g_free(pass);
 
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index fad1e7a..69a7f8a 100644
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -1,5 +1,5 @@
 /* select-keys.c - GTK+ based key selection
- *      Copyright (C) 2001-2012 Werner Koch (dd9jn) and the Claws Mail team
+ * Copyright (C) 2001-2016 Werner Koch (dd9jn) and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify        
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -290,7 +289,7 @@ fill_clist (struct select_keys_s *sk, const char *pattern, gpgme_protocol_t prot
 
     err = gpgme_op_keylist_start (ctx, pattern, 0);
     if (err) {
-        debug_print ("** gpgme_op_keylist_start(%s) failed: %s",
+        debug_print ("** gpgme_op_keylist_start(%s) failed: %s\n",
                      pattern != NULL ? pattern : "NULL", gpgme_strerror (err));
         sk->select_ctx = NULL;
         gpgme_release(ctx);
@@ -336,7 +335,7 @@ fill_clist (struct select_keys_s *sk, const char *pattern, gpgme_protocol_t prot
 
     debug_print ("%% %s:%d:  ready\n", __FILE__ ,__LINE__ );
     if (gpgme_err_code(err) != GPG_ERR_EOF) {
-        debug_print ("** gpgme_op_keylist_next failed: %s",
+        debug_print ("** gpgme_op_keylist_next failed: %s\n",
                      gpgme_strerror (err));
         gpgme_op_keylist_end(ctx);
     }
@@ -505,7 +504,7 @@ select_btn_cb (GtkWidget *widget, gpointer data)
 
     cm_return_if_fail (sk);
     if (!sk->clist->selection) {
-        debug_print ("** nothing selected");
+        debug_print ("** nothing selected\n");
         return;
     }
     row = GPOINTER_TO_INT(sk->clist->selection->data);
@@ -531,7 +530,7 @@ select_btn_cb (GtkWidget *widget, gpointer data)
         if ( uid->validity < GPGME_VALIDITY_FULL ) {
             use_key = use_untrusted(key, uid, sk->proto);
             if (!use_key) {
-                debug_print ("** Key untrusted, will not encrypt");
+                debug_print ("** Key untrusted, will not encrypt\n");
                 return;
             }
         }
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 796eb50..54289f6 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 the Claws Mail team
+ * Copyright (C) 1999-2016 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -621,17 +621,17 @@ gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account,
 			}
 
 			if (key->expired) {
-				debug_print("skipping a key, expired");
+				debug_print("skipping a key, expired\n");
 				gpgme_key_release(key);
 				continue;
 			}
 			if (key->revoked) {
-				debug_print("skipping a key, revoked");
+				debug_print("skipping a key, revoked\n");
 				gpgme_key_release(key);
 				continue;
 			}
 			if (key->disabled) {
-				debug_print("skipping a key, disabled");
+				debug_print("skipping a key, disabled\n");
 				gpgme_key_release(key);
 				continue;
 			}
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index dfe1ca7..5c1c1d3 100644
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Colin Leroy and the Claws Mail team
+ * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@ static PrivacyDataPGP *pgpinline_new_privacydata()
 	data->is_signed = FALSE;
 	data->sigstatus = NULL;
 	if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		return NULL;
 	}
 	
@@ -192,7 +192,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
 	g_free(tmp);
 	
 	if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		g_free(textdata);
 		return 0;
@@ -514,7 +514,7 @@ static gboolean pgpinline_sign(MimeInfo *mimeinfo, PrefsAccount *account, const
 	gpgme_data_new_from_mem(&gpgtext, textstr, (size_t)strlen(textstr), 0);
 	gpgme_data_new(&gpgsig);
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		return FALSE;
 	}
@@ -653,7 +653,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 	kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
 	memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		g_free(kset);
 		return FALSE;
@@ -709,7 +709,7 @@ static gboolean pgpinline_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 	gpgme_data_new_from_mem(&gpgtext, textstr, (size_t)strlen(textstr), 0);
 	gpgme_data_new(&gpgenc);
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		g_free(kset);
 		return FALSE;
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 5b8b190..837e379 100644
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 the Claws Mail team
+ * Copyright (C) 1999-2016 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -179,7 +179,7 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
 	cm_return_val_if_fail(mimeinfo->privacy != NULL, -1);
 	data = (PrivacyDataPGP *) mimeinfo->privacy;
 	if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		return 0;
 	}
@@ -325,7 +325,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
 	gpgme_error_t err;
 
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		return NULL;
 	}
@@ -505,7 +505,7 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *fr
 	gpgme_data_new_from_mem(&gpgtext, textstr, (size_t)strlen(textstr), 0);
 	gpgme_data_new(&gpgsig);
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		return FALSE;
 	}
@@ -648,7 +648,7 @@ gboolean pgpmime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
 	kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
 	memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
 	if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
-		debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
+		debug_print(("Couldn't initialize GPG context, %s\n"), gpgme_strerror(err));
 		privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
 		g_free(kset);
 		return FALSE;
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
index 526a03e..03ed669 100644
--- a/src/plugins/smime/smime.c
+++ b/src/plugins/smime/smime.c
@@ -1,7 +1,6 @@
 /* 
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin at colino.net> and 
- * the Claws Mail team
+ * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -68,7 +66,7 @@ static PrivacyDataPGP *smime_new_privacydata()
 	gpgme_ctx_t 	ctx;
 
 	if (gpgme_new(&ctx) != GPG_ERR_NO_ERROR) {
-		debug_print("gpgme_new failed");
+		debug_print("gpgme_new failed\n");
 		return NULL;
 	}
 
diff --git a/src/plugins/vcalendar/vcal_dbus.c b/src/plugins/vcalendar/vcal_dbus.c
index 38d86b3..0a54462 100644
--- a/src/plugins/vcalendar/vcal_dbus.c
+++ b/src/plugins/vcalendar/vcal_dbus.c
@@ -180,7 +180,7 @@ void connect_dbus(void)
 	introspection_data = g_dbus_node_info_new_for_xml(
 				introspection_xml, NULL);
 	if (introspection_data == NULL) {
-		debug_print("Couldn't figure out XML.");
+		debug_print("Couldn't figure out XML.\n");
 		return;
 	}
 	
diff --git a/src/procmime.c b/src/procmime.c
index 7823ccf..c29da8c 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -2351,7 +2350,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
 		break;
 #else
 	case ENC_AS_EXTENDED:
-		debug_print("Unhandled ENC_AS_EXTENDED.");
+		debug_print("Unhandled ENC_AS_EXTENDED.\n");
 		break;
 #endif
 	case ENC_AS_ENCWORD:
diff --git a/src/summaryview.c b/src/summaryview.c
index b9e75ca..57511b3 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2422,7 +2422,7 @@ void summary_attract_by_subject(SummaryView *summaryview)
 	MsgInfo *src_msginfo, *dst_msginfo;
 	GHashTable *subject_table;
 
-	debug_print("Attracting messages by subject...");
+	debug_print("Attracting messages by subject...\n");
 	STATUSBAR_PUSH(summaryview->mainwin,
 		       _("Attracting messages by subject..."));
 
@@ -2468,7 +2468,7 @@ void summary_attract_by_subject(SummaryView *summaryview)
 
 	summary_thaw(summaryview);
 
-	debug_print("done.\n");
+	debug_print("Attracting messages by subject done.\n");
 	STATUSBAR_POP(summaryview->mainwin);
 
 	main_window_cursor_normal(summaryview->mainwin);
@@ -2968,7 +2968,7 @@ void summary_sort(SummaryView *summaryview,
 		goto unlock;
 
 	if (cmp_func != NULL) {
-		debug_print("Sorting summary...");
+		debug_print("Sorting summary...\n");
 		STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
 
 		main_window_cursor_wait(summaryview->mainwin);
@@ -2982,7 +2982,7 @@ void summary_sort(SummaryView *summaryview,
 
 		main_window_cursor_normal(summaryview->mainwin);
 
-		debug_print("done.\n");
+		debug_print("Sorting summary done.\n");
 		STATUSBAR_POP(summaryview->mainwin);
 	}
 unlock:
@@ -3106,7 +3106,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 	
 	if (!mlist) return;
 
-	debug_print("\tSetting summary from message data...\n");
+	debug_print("Setting summary from message data...\n");
 	STATUSBAR_PUSH(summaryview->mainwin,
 		       _("Setting summary from message data..."));
 	gdk_flush();
@@ -3194,7 +3194,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 	if (prefs_common.use_addr_book)
 		end_address_completion();
 
-	debug_print("done.\n");
+	debug_print("Setting summary from message data done.\n");
 	STATUSBAR_POP(summaryview->mainwin);
 	if (debug_get_mode()) {
 		debug_print("\tmsgid hash table size = %d\n",
@@ -5317,7 +5317,7 @@ static void summary_thread_build(SummaryView *summaryview)
 
 	summary_lock(summaryview);
 
-	debug_print("Building threads...");
+	debug_print("Building threads...\n");
 	STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
 	main_window_cursor_wait(summaryview->mainwin);
 
@@ -5366,7 +5366,7 @@ static void summary_thread_build(SummaryView *summaryview)
 	g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
 					 G_CALLBACK(summary_tree_expanded), summaryview);
 
-	debug_print("done.\n");
+	debug_print("Building threads done.\n");
 	STATUSBAR_POP(summaryview->mainwin);
 	main_window_cursor_normal(summaryview->mainwin);
 
@@ -5402,7 +5402,7 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	gboolean froze = FALSE;
 
-	debug_print("Unthreading for execution...");
+	debug_print("Unthreading for execution...\n");
 
 	START_LONG_OPERATION(summaryview, TRUE);
 	for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
@@ -5412,7 +5412,7 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
 
 	END_LONG_OPERATION(summaryview);
 
-	debug_print("done.\n");
+	debug_print("Unthreading for execution done.\n");
 }
 
 static void summary_unthread_for_exec_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
@@ -5631,7 +5631,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
 
 	folder_item_update_freeze();
 	
-	debug_print("filtering...");
+	debug_print("filtering...\n");
 	STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
 	main_window_cursor_wait(summaryview->mainwin);
 
@@ -5667,7 +5667,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
 	summary_thaw(summaryview);
 
 	folder_item_update_thaw();
-	debug_print("done.\n");
+	debug_print("filtering done.\n");
 	STATUSBAR_POP(summaryview->mainwin);
 	main_window_cursor_normal(summaryview->mainwin);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list