* 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-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
2004-09-06 [colin] 0.9.12cvs96
* src/toolbar.c
( cvs diff -u -r 1.70 -r 1.71 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.14 -r 1.15 src/addritem.c; cvs diff -u -r 1.13 -r 1.14 src/addritem.h; ) > 0.9.12cvs94.patchset
( cvs diff -u -r 1.445 -r 1.446 src/summaryview.c; cvs diff -u -r 1.125 -r 1.126 src/mimeview.c; ) > 0.9.12cvs95.patchset
( cvs diff -u -r 1.54 -r 1.55 src/toolbar.c; ) > 0.9.12cvs96.patchset
( cvs diff -u -r 1.70 -r 1.71 src/addressbook.c; cvs diff -u -r 1.5 -r 1.6 src/addressitem.h; cvs diff -u -r 1.14 -r 1.15 src/addritem.c; cvs diff -u -r 1.13 -r 1.14 src/addritem.h; ) > 0.9.12cvs94.patchset
( cvs diff -u -r 1.445 -r 1.446 src/summaryview.c; cvs diff -u -r 1.125 -r 1.126 src/mimeview.c; ) > 0.9.12cvs95.patchset
( cvs diff -u -r 1.54 -r 1.55 src/toolbar.c; ) > 0.9.12cvs96.patchset
+( cvs diff -u -r 1.175 -r 1.176 src/inc.c; ) > 0.9.12cvs97.patchset
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
const gchar *file);
static void inc_put_error (IncState istate,
const gchar *file);
static void inc_put_error (IncState istate,
static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
manage_window_focus_in
(inc_dialog->dialog->window,
NULL, NULL);
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,
if (inc_dialog->show_dialog)
manage_window_focus_out
(inc_dialog->dialog->window,
-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;
{
gchar *log_msg = NULL;
gchar *err_msg = NULL;
log_msg = _("Connection failed.");
if (prefs_common.no_recv_err_panel)
break;
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;
break;
case INC_ERROR:
log_msg = _("Error occurred while processing mail.");
if (prefs_common.no_recv_err_panel)
break;
+ if (session->error_msg)
err_msg = g_strdup_printf
(_("Error occurred while processing mail:\n%s"),
err_msg = g_strdup_printf
(_("Error occurred while processing mail:\n%s"),
else
err_msg = g_strdup(log_msg);
break;
else
err_msg = g_strdup(log_msg);
break;
log_msg = _("Socket error.");
if (prefs_common.no_recv_err_panel)
break;
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;
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;
break;
case INC_LOCKED:
log_msg = _("Mailbox is locked.");
if (prefs_common.no_recv_err_panel)
break;
+ if (session->error_msg)
err_msg = g_strdup_printf(_("Mailbox is locked:\n%s"),
err_msg = g_strdup_printf(_("Mailbox is locked:\n%s"),
else
err_msg = g_strdup(log_msg);
break;
else
err_msg = g_strdup(log_msg);
break;
log_msg = _("Authentication failed.");
if (prefs_common.no_recv_err_panel)
break;
log_msg = _("Authentication failed.");
if (prefs_common.no_recv_err_panel)
break;
+ if (session->error_msg)
err_msg = g_strdup_printf
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;
else
err_msg = g_strdup(log_msg);
break;
log_msg = _("Session timed out.");
if (prefs_common.no_recv_err_panel)
break;
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);