Fix some odd debug outputs

diff --git a/src/action.c b/src/action.c
index 57398f880d6b59b7998e16928931ba77756fd80c..f5ab41b3b58de137b277fcc17df33f47408076c6 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * 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
  *
  * 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/>.
  *
  * 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
  */
 
 #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)
                        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;
        }
 
        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)
        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");
 }
        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 eb71e7b1dfab51e6b7d05cdd76c10c167c0712fc..2892b3c318597d70da6c9736d4db6d3c5e2b8f40 100644 (file)
--- 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) {
        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;
        }
        dbus_error_free(error);
        return;
        }

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 3c91c1e5fb5d91729fe3ebb109fee4005045057d..28a6f7c064446581a7be1ac16859de0d31193dc9 100644 (file)
--- 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
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2015 Colin Leroy <colin@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
  *
  * 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/>.
  *
  * 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
  */
 
 #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)) {
                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;
                                cert->fingerprint, fingerprint);
                                
                        return (guint)-1;

diff --git a/src/headerview.c b/src/headerview.c
index a8931161f018f388b036f0c0a46d2c16c9747cff..240aba51cbd8bab65a1adabb4400d91cac8ab9e1 100644 (file)
--- 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
  *
  * 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/>.
  *
  * 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
  */
 
 #ifdef HAVE_CONFIG_H


@@ -323,7 +322,7 @@ static gint headerview_show_contact_pic (HeaderView *headerview, MsgInfo *msginf
 
        g_free(filename);
        if (error) {
 
        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;
                                error->message);
                g_error_free(error);
                return -1;

diff --git a/src/imap.c b/src/imap.c
index 57bff7926cb40ae47aadd1d67728da8184494f61..b0381964867492735037b3c597dcbd6e50dc4b84 100644 (file)
--- 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
  *
  * 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/>.
  *
  * 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
  */
 
 #ifdef HAVE_CONFIG_H


@@ -3750,7 +3749,7 @@ gchar imap_get_path_separator_for_item(FolderItem *item)
 
        imap_folder = IMAP_FOLDER(folder);
 
 
        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;
        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 df0986e39aedd51ec15fc501eae42fa8a9a1f81f..8e013bd4c93a399bec24fd3d42cdb11c9ee0cab8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * 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
  *
  * 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);
        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,
                                item, 
                                (item && item->path)?item->path:"(null)",
                                item?folder_item_parent(item):0x0,

diff --git a/src/textview.c b/src/textview.c
index b4dec3164db53b91cbecde09e11d2243c462ed85..523d060ca72b6fe45d33669d0e26d9eae60d4c70 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * 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
  *
  * 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) {
                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;
                                error->message);
                g_error_free(error);
                goto bail;

diff --git a/src/undo.c b/src/undo.c
index 61c4573404d907cd81ccc388bf390e22f63424a7..92c1f442ae668a58a9cceeaf50f1a3f348351613 100644 (file)
--- 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
  *
  * 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/>.
  *
  * 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 */
  */
 
 /* 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
                        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;
 }
 
        return TRUE;
 }