[Commits] [SCM] claws branch, master, updated. 3.13.2-100-ga1bb5a0

mones at claws-mail.org mones at claws-mail.org
Sat Apr 2 15:41:19 CEST 2016


The branch, master has been updated
       via  a1bb5a00040354c00c73384de6b389096c8391dc (commit)
      from  e10f0ced1ef1e5b2b697227b49ef6ad173439c9b (commit)

Summary of changes:
 src/action.c                 |    7 +++----
 src/addressbook-dbus.c       |    2 +-
 src/common/ssl_certificate.c |    6 ++----
 src/headerview.c             |    7 +++----
 src/imap.c                   |    7 +++----
 src/summaryview.c            |    4 ++--
 src/textview.c               |    4 ++--
 src/undo.c                   |    7 +++----
 8 files changed, 19 insertions(+), 25 deletions(-)


- Log -----------------------------------------------------------------
commit a1bb5a00040354c00c73384de6b389096c8391dc
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Apr 2 15:41:04 2016 +0200

    Fix some odd debug outputs

diff --git a/src/action.c b/src/action.c
index 57398f8..f5ab41b 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto & The Claws Mail Team
+ * 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
@@ -1043,7 +1042,7 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
 			r = close(chld_in);
 		child_info->chld_in = -1; /* No more input */
 		if (r != 0)
-			debug_print("%s(%d)", g_strerror(errno), errno);
+			debug_print("piping to child process: %s (%d)\n", g_strerror(errno), errno);
 	}
 
 	return child_info;
@@ -1510,7 +1509,7 @@ static void catch_input(gpointer data, gint source, GIOCondition cond)
 	r = close(child_info->chld_in);
 	child_info->chld_in = -1;
 	if (r != 0)
-		debug_print("%s(%d)", g_strerror(errno), errno);
+		debug_print("closing child input fd: %s (%d)\n", g_strerror(errno), errno);
 	child_info->chld_in = -1;
 	debug_print("Input to grand child sent.\n");
 }
diff --git a/src/addressbook-dbus.c b/src/addressbook-dbus.c
index eb71e7b..2892b3c 100644
--- a/src/addressbook-dbus.c
+++ b/src/addressbook-dbus.c
@@ -425,7 +425,7 @@ void addressbook_connect_signals(Compose* compose) {
 	compose_instance = compose;
 	dbus_bus_add_match(bus, "type='signal',interface='org.clawsmail.Contacts'", error);
 	if (error) {
-    	debug_print("Failed to add match to the D-BUS daemon: %s", error->message);
+		debug_print("Failed to add match to the D-BUS daemon: %s\n", error->message);
     	dbus_error_free(error);
     	return;
 	}
diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 3c91c1e..28a6f7c 100644
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -1,7 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 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
@@ -15,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
@@ -574,7 +572,7 @@ static guint check_cert(SSLCertificate *cert)
 		gnutls_x509_crt_get_fingerprint(chain[0], GNUTLS_DIG_MD5, md, &n);
 		fingerprint = readable_fingerprint(md, n);
 		if (!fingerprint || strcmp(fingerprint, cert->fingerprint)) {
-			debug_print("Saved chain fingerprint does not match current : %s / %s",
+			debug_print("saved chain fingerprint does not match current : %s / %s\n",
 				cert->fingerprint, fingerprint);
 				
 			return (guint)-1;
diff --git a/src/headerview.c b/src/headerview.c
index a893116..240aba5 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 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
@@ -323,7 +322,7 @@ static gint headerview_show_contact_pic (HeaderView *headerview, MsgInfo *msginf
 
 	g_free(filename);
 	if (error) {
-		debug_print("Failed to import image: \n%s",
+		debug_print("Failed to import image: %s\n",
 				error->message);
 		g_error_free(error);
 		return -1;
diff --git a/src/imap.c b/src/imap.c
index 57bff79..b038196 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 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
@@ -3750,7 +3749,7 @@ gchar imap_get_path_separator_for_item(FolderItem *item)
 
 	imap_folder = IMAP_FOLDER(folder);
 
-	debug_print("getting session...");
+	debug_print("getting session...\n");
 	session = imap_session_get(FOLDER(folder));
 	result = imap_get_path_separator(session, imap_folder, item->path, &ok);
 	return result;
diff --git a/src/summaryview.c b/src/summaryview.c
index df0986e..8e013bd 100644
--- a/src/summaryview.c
+++ b/src/summaryview.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
@@ -1318,7 +1318,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 	buf = NULL;
 	if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
 		g_free(buf);
-		debug_print("empty folder (%p %s %p %d)\n\n",
+		debug_print("empty folder (%p %s %p %d)\n",
 				item, 
 				(item && item->path)?item->path:"(null)",
 				item?folder_item_parent(item):0x0,
diff --git a/src/textview.c b/src/textview.c
index b4dec31..523d060 100644
--- a/src/textview.c
+++ b/src/textview.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
@@ -2106,7 +2106,7 @@ static void textview_show_contact_pic(TextView *textview)
 		picture = 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 bail;
diff --git a/src/undo.c b/src/undo.c
index 61c4573..92c1f44 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 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/>.
- * 
  */
 
 /* code ported from gedit */
@@ -271,7 +270,7 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos,
 			last_undo->text = temp_string;
 		}
 	} else
-		debug_print("Unknown action [%i] inside undo merge encountered", action);
+		debug_print("Unknown action [%i] inside undo merge encountered\n", action);
 
 	return TRUE;
 }

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list