2004-09-07 [colin] 0.9.12cvs97.1

	* src/inc.c
		Sync with HEAD (meaningful error messages)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 1c15587f9208ae4fc871128c8f6e681fcdd74194..84c5a0789139f7b13861810a28511c986645399a 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-07 [colin]     0.9.12cvs97.1
+
+       * src/inc.c
+               Sync with HEAD (meaningful error messages)
+
 2004-09-06 [colin]     0.9.12cvs96.1
 
        * src/toolbar.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a702c75e99ff7bbbe8d14a02f75c6daa9842120c..272b0f431b9cabf0dace29bfcd0f54a9b9ccfbdc 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,69 @@
+2004-09-07 [colin]     0.9.12cvs97
+
+       * src/inc.c
+               Change session error messages so that they
+               are a bit more helpful (the origin of the
+               error is not apparent if one isn't in 
+               front of Sylpheed when it happens).
+
+2004-09-06 [colin]     0.9.12cvs96
+
+       * src/toolbar.c
+               Fix graying out Redirect in non english languages
+               Patch by Fabien Vantard
+
+2004-09-06 [colin]     0.9.12cvs95
+
+       * src/summaryview.c
+       * src/mimeview.c
+               Fix dropped URIs
+
+2004-09-06 [colin]     0.9.12cvs94
+
+       * src/addressbook.c
+       * src/addressitem.h
+       * src/addritem.c
+       * src/addritem.h
+               Add basic drag and drop to addressbook
+
+2004-09-03 [colin]     0.9.12cvs93
+
+       * src/summaryview.c
+               Next/Prev unread message should start
+               from next/prev node (especially if 
+               mark_as_read_delay != 0)
+
+2004-09-03 [colin]     0.9.12cvs92
+
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/summaryview.c
+               Add an hidden 'mark_as_read_delay' pref 
+
+2004-09-02 [colin]     0.9.12cvs91
+
+       * src/gtk/menu.c
+               Add unduplicated menu entries (fixes bug 532)
+               Patch by Fabien Vantard
+
+2004-09-02 [colin]     0.9.12cvs90
+
+       * src/account.c
+               Fix bug 582 (broken auto account selection)
+
+2004-09-02 [colin]     0.9.12cvs89
+
+       * src/addrindex.c
+               Free deleted queries too
+
+2004-09-02 [colin]     0.9.12cvs88
+
+       * src/ldapquery.c
+               Fix freezes in LDAP, due to memory corruption
+               after deletion of a query (and not removing it
+               from the corresponding list of queries).
+               Very probably fixes bug 567 and bug 569
+
 2004-09-02 [colin]     0.9.12cvs87
 
        * src/prefs_spelling.c

diff --git a/PATCHSETS b/PATCHSETS
index 704baafdb314a1bf0dc2dd38d648225bcf800f9b..a4c4fc5bff5e01f77edc8cc4f19b7bb796fb3583 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -162,3 +162,4 @@
 ( cvs diff -u -r 1.60.2.9 -r 1.60.2.10 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/addritem.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/addritem.h; ) > 0.9.12cvs94.1.patchset
 ( cvs diff -u -r 1.395.2.31 -r 1.395.2.32 src/summaryview.c; cvs diff -u -r 1.83.2.18 -r 1.83.2.19 src/mimeview.c; ) > 0.9.12cvs95.1.patchset
 ( cvs diff -u -r 1.43.2.9 -r 1.43.2.10 src/toolbar.c; ) > 0.9.12cvs96.1.patchset
+( cvs diff -u -r 1.2504.2.18 -r 1.2504.2.19 ChangeLog.claws; cvs diff -u -r 1.149.2.13 -r 1.149.2.14 src/inc.c; ) > 0.9.12cvs97.1.patchset

diff --git a/configure.ac b/configure.ac
index 8969c1078596261d66ca8a3ad04e16e570142b23..50e45a1fbdf6a7fea357aa69c1e61ffc36f01deb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=96
+EXTRA_VERSION=97
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/inc.c b/src/inc.c
index e8cd43244845e4c63987e810032f350b2b507071..a0d68701014f48de714d30cefe9f4ad061061766 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -123,7 +123,7 @@ static gint inc_drop_message                (Pop3Session    *session,
                                         const gchar    *file);
 
 static void inc_put_error              (IncState        istate,
-                                        const gchar    *msg);
+                                        Pop3Session    *session);
 
 static void inc_cancel_cb              (GtkWidget      *widget,
                                         gpointer        data);
@@ -660,7 +660,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                                manage_window_focus_in
                                        (inc_dialog->dialog->window,
                                         NULL, NULL);
-                       inc_put_error(inc_state, pop3_session->error_msg);
+                       inc_put_error(inc_state, pop3_session);
                        if (inc_dialog->show_dialog)
                                manage_window_focus_out
                                        (inc_dialog->dialog->window,
@@ -1073,7 +1073,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
        return 0;
 }
 
-static void inc_put_error(IncState istate, const gchar *msg)
+static void inc_put_error(IncState istate, Pop3Session *session)
 {
        gchar *log_msg = NULL;
        gchar *err_msg = NULL;
@@ -1084,16 +1084,18 @@ static void inc_put_error(IncState istate, const gchar *msg)
                log_msg = _("Connection failed.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               err_msg = g_strdup(log_msg);
+               err_msg = g_strdup_printf(_("Connection to %s:%d failed."),
+                                         SESSION(session)->server, 
+                                         SESSION(session)->port);
                break;
        case INC_ERROR:
                log_msg = _("Error occurred while processing mail.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               if (msg)
+               if (session->error_msg)
                        err_msg = g_strdup_printf
                                (_("Error occurred while processing mail:\n%s"),
-                                msg);
+                                session->error_msg);
                else
                        err_msg = g_strdup(log_msg);
                break;
@@ -1111,21 +1113,25 @@ static void inc_put_error(IncState istate, const gchar *msg)
                log_msg = _("Socket error.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               err_msg = g_strdup(log_msg);
+               err_msg = g_strdup_printf(_("Socket error on connection to %s:%d."),
+                                         SESSION(session)->server, 
+                                         SESSION(session)->port);
                break;
        case INC_EOF:
                log_msg = _("Connection closed by the remote host.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               err_msg = g_strdup(log_msg);
+               err_msg = g_strdup_printf(_("Connection to %s:%d closed by the remote host."), 
+                                         SESSION(session)->server, 
+                                         SESSION(session)->port);
                break;
        case INC_LOCKED:
                log_msg = _("Mailbox is locked.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               if (msg)
+               if (session->error_msg)
                        err_msg = g_strdup_printf(_("Mailbox is locked:\n%s"),
-                                                 msg);
+                                                 session->error_msg);
                else
                        err_msg = g_strdup(log_msg);
                break;
@@ -1133,9 +1139,9 @@ static void inc_put_error(IncState istate, const gchar *msg)
                log_msg = _("Authentication failed.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               if (msg)
+               if (session->error_msg)
                        err_msg = g_strdup_printf
-                               (_("Authentication failed:\n%s"), msg);
+                               (_("Authentication failed:\n%s"), session->error_msg);
                else
                        err_msg = g_strdup(log_msg);
                break;
@@ -1143,7 +1149,9 @@ static void inc_put_error(IncState istate, const gchar *msg)
                log_msg = _("Session timed out.");
                if (prefs_common.no_recv_err_panel)
                        break;
-               err_msg = g_strdup(log_msg);
+               err_msg = g_strdup_printf(_("Connection to %s:%d timed out."), 
+                                         SESSION(session)->server, 
+                                         SESSION(session)->port);
                break;
        default:
                break;