DeforaOS/Mailer
DeforaOS/Mailer
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Make sure to report fatal errors with a reference to the current account

Browse Source
This commit is contained in:
Pierre Pronchery 2012-11-09 16:15:39 +01:00
parent 05b4b172d2
commit 4c91b7aceb
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/account/imap4.c
View File

@ -987,13 +987,13 @@ static gboolean _on_connect(gpointer data)
/* lookup the address */ /* lookup the address */
if(_imap4_lookup(imap4, hostname, port, &sa) != 0) if(_imap4_lookup(imap4, hostname, port, &sa) != 0)
{ {
helper->error(NULL, error_get(), 1); helper->error(helper->account, error_get(), 1);
return FALSE; return FALSE;
} }
/* create the socket */ /* create the socket */
if((imap4->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) if((imap4->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{ {
helper->error(NULL, strerror(errno), 1); helper->error(helper->account, strerror(errno), 1);
return _on_reset(imap4); return _on_reset(imap4);
} }
if((res = fcntl(imap4->fd, F_GETFL)) >= 0 if((res = fcntl(imap4->fd, F_GETFL)) >= 0
@ -1011,7 +1011,7 @@ static gboolean _on_connect(gpointer data)
{ {
snprintf(buf, sizeof(buf), "%s (%s)", "Connection failed", snprintf(buf, sizeof(buf), "%s (%s)", "Connection failed",
strerror(errno)); strerror(errno));
helper->error(NULL, buf, 1); helper->error(helper->account, buf, 1);
return _on_reset(imap4); return _on_reset(imap4);
} }
imap4->wr_source = g_io_add_watch(imap4->channel, G_IO_OUT, imap4->wr_source = g_io_add_watch(imap4->channel, G_IO_OUT,
@ -1094,7 +1094,7 @@ static gboolean _on_watch_can_connect(GIOChannel * source,
{ {
snprintf(buf, sizeof(buf), "%s (%s)", "Connection failed", snprintf(buf, sizeof(buf), "%s (%s)", "Connection failed",
strerror(res)); strerror(res));
helper->error(NULL, buf, 1); helper->error(helper->account, buf, 1);
return FALSE; return FALSE;
} }
/* XXX remember the address instead */ /* XXX remember the address instead */
@ -1113,14 +1113,14 @@ static gboolean _on_watch_can_connect(GIOChannel * source,
return FALSE; return FALSE;
if((imap4->ssl = SSL_new(ssl_ctx)) == NULL) if((imap4->ssl = SSL_new(ssl_ctx)) == NULL)
{ {
helper->error(NULL, ERR_error_string(ERR_get_error(), helper->error(helper->account, ERR_error_string(
buf), 1); ERR_get_error(), buf), 1);
return FALSE; return FALSE;
} }
if(SSL_set_fd(imap4->ssl, imap4->fd) != 1) if(SSL_set_fd(imap4->ssl, imap4->fd) != 1)
{ {
helper->error(NULL, ERR_error_string(ERR_get_error(), helper->error(helper->account, ERR_error_string(
buf), 1); ERR_get_error(), buf), 1);
SSL_free(imap4->ssl); SSL_free(imap4->ssl);
imap4->ssl = NULL; imap4->ssl = NULL;
return FALSE; return FALSE;
@ -1212,6 +1212,7 @@ static gboolean _on_watch_can_read(GIOChannel * source, GIOCondition condition,
gpointer data) gpointer data)
{ {
IMAP4 * imap4 = data; IMAP4 * imap4 = data;
AccountPluginHelper * helper = imap4->helper;
char * p; char * p;
gsize cnt = 0; gsize cnt = 0;
GError * error = NULL; GError * error = NULL;
@ -1239,7 +1240,7 @@ static gboolean _on_watch_can_read(GIOChannel * source, GIOCondition condition,
case G_IO_STATUS_NORMAL: case G_IO_STATUS_NORMAL:
break; break;
case G_IO_STATUS_ERROR: case G_IO_STATUS_ERROR:
imap4->helper->error(NULL, error->message, 1); helper->error(helper->account, error->message, 1);
case G_IO_STATUS_EOF: case G_IO_STATUS_EOF:
default: default:
imap4->rd_source = g_idle_add(_on_reset, imap4); imap4->rd_source = g_idle_add(_on_reset, imap4);
@ -1313,7 +1314,7 @@ static gboolean _on_watch_can_read_ssl(GIOChannel * source,
else else
{ {
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf); ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf);
imap4->helper->error(NULL, buf, 1); imap4->helper->error(imap4->helper->account, buf, 1);
imap4->rd_source = g_idle_add(_on_reset, imap4); imap4->rd_source = g_idle_add(_on_reset, imap4);
} }
return FALSE; return FALSE;
@ -1362,6 +1363,7 @@ static gboolean _on_watch_can_write(GIOChannel * source, GIOCondition condition,
gpointer data) gpointer data)
{ {
IMAP4 * imap4 = data; IMAP4 * imap4 = data;
AccountPluginHelper * helper = imap4->helper;
IMAP4Command * cmd = &imap4->queue[0]; IMAP4Command * cmd = &imap4->queue[0];
gsize cnt = 0; gsize cnt = 0;
GError * error = NULL; GError * error = NULL;
@ -1394,7 +1396,7 @@ static gboolean _on_watch_can_write(GIOChannel * source, GIOCondition condition,
case G_IO_STATUS_NORMAL: case G_IO_STATUS_NORMAL:
break; break;
case G_IO_STATUS_ERROR: case G_IO_STATUS_ERROR:
imap4->helper->error(NULL, error->message, 1); helper->error(helper->account, error->message, 1);
case G_IO_STATUS_EOF: case G_IO_STATUS_EOF:
default: default:
imap4->wr_source = g_idle_add(_on_reset, imap4); imap4->wr_source = g_idle_add(_on_reset, imap4);
@ -1416,6 +1418,7 @@ static gboolean _on_watch_can_write_ssl(GIOChannel * source,
GIOCondition condition, gpointer data) GIOCondition condition, gpointer data)
{ {
IMAP4 * imap4 = data; IMAP4 * imap4 = data;
AccountPluginHelper * helper = imap4->helper;
IMAP4Command * cmd = &imap4->queue[0]; IMAP4Command * cmd = &imap4->queue[0];
int cnt; int cnt;
char * p; char * p;
@ -1441,7 +1444,7 @@ static gboolean _on_watch_can_write_ssl(GIOChannel * source,
else else
{ {
ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf); ERR_error_string(SSL_get_error(imap4->ssl, cnt), buf);
imap4->helper->error(NULL, buf, 1); helper->error(helper->account, buf, 1);
imap4->wr_source = g_idle_add(_on_reset, imap4); imap4->wr_source = g_idle_add(_on_reset, imap4);
} }
return FALSE; return FALSE;