callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some operation progress reporting. Actual data transfer is 'tricky'

Browse Source 
2001-07-23  Not Zed  <NotZed@Ximian.com>

	* providers/smtp/camel-smtp-transport.c (smtp_auth, smtp_helo,
	send_to): Added some operation progress reporting.  Actual data
	transfer is 'tricky' because of the layers used.
	(smtp_auth): Instead of checking exception_is_set, use
	challenge==NULL to test if sasl_challenge_base64 failed.

	* providers/local/camel-mbox-summary.c (mbox_summary_sync): Remove
	peters changes below and put in a better fix.  These functions
	already return -1 on error, just use that, and not worry about
	building our own exception redundantly.

	* camel-service.c (camel_get_host_byname): Turn the progress into
	a transient event.

svn path=/trunk/; revision=11301
This commit is contained in:
Not Zed
2001-07-23 02:35:21 +00:00
committed by Michael Zucci
parent 97cc1d57ad
commit 833bb47399
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
camel/ChangeLog
View File

@ -1,3 +1,19 @@
2001-07-23 Not Zed <NotZed@Ximian.com>
* providers/smtp/camel-smtp-transport.c (smtp_auth, smtp_helo,
send_to): Added some operation progress reporting. Actual data
transfer is 'tricky' because of the layers used.
(smtp_auth): Instead of checking exception_is_set, use
challenge==NULL to test if sasl_challenge_base64 failed.
* providers/local/camel-mbox-summary.c (mbox_summary_sync): Remove
peters changes below and put in a better fix. These functions
already return -1 on error, just use that, and not worry about
building our own exception redundantly.
* camel-service.c (camel_get_host_byname): Turn the progress into
a transient event.
2001-07-20 Peter Williams <peterw@ximian.com>
* providers/local/camel-mbox-summary.c (mbox_summary_sync): More

2
camel/camel-service.c
View File

@ -545,7 +545,7 @@ struct hostent *camel_get_host_byname(const char *name, CamelException *ex)
return NULL;
}
camel_operation_start(NULL, _("Resolving: %s"), name);
camel_operation_start_transient(NULL, _("Resolving: %s"), name);
msg = g_malloc0(sizeof(*msg));
msg->hostbuflen = 1024;

7
camel/providers/local/camel-mbox-summary.c
View File

@ -829,7 +829,6 @@ static int
mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)
{
struct stat st;
CamelException internal_ex;
CamelMboxSummary *mbs = (CamelMboxSummary *)cls;
CamelFolderSummary *s = (CamelFolderSummary *)cls;
int i, count;
@ -837,12 +836,8 @@ mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInf
int ret;
/* first, sync ourselves up, just to make sure */
camel_exception_init (&internal_ex);
summary_update(cls, mbs->folder_size, changeinfo, &internal_ex);
if (camel_exception_is_set(&internal_ex)) {
camel_exception_xfer (ex, &internal_ex);
if (summary_update(cls, mbs->folder_size, changeinfo, ex) == -1)
return -1;
}
count = camel_folder_summary_count(s);
if (count == 0)

31
camel/providers/smtp/camel-smtp-transport.c
View File

@ -47,6 +47,7 @@
#include "camel-mime-message.h"
#include "camel-multipart.h"
#include "camel-mime-part.h"
#include "camel-operation.h"
#include "camel-stream-buffer.h"
#include "camel-tcp-stream.h"
#include "camel-tcp-stream-raw.h"
@ -570,6 +571,8 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message,
"sender address not valid."));
return FALSE;
}
camel_operation_start(NULL, _("Sending message"));
/* find out if the message has 8bit mime parts */
has_8bit_parts = camel_mime_message_has_8bit_parts (CAMEL_MIME_MESSAGE (message));
@ -582,6 +585,7 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message,
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Cannot send message: "
"no recipients defined."));
camel_operation_end(NULL);
return FALSE;
}
@ -589,6 +593,7 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message,
recipient = (char *) r->data;
if (!smtp_rcpt (smtp_transport, recipient, ex)) {
g_free (recipient);
camel_operation_end(NULL);
return FALSE;
}
g_free (recipient);
@ -597,11 +602,15 @@ smtp_send_to (CamelTransport *transport, CamelMedium *message,
/* passing in has_8bit_parts saves time as we don't have to
recurse through the message all over again if the user is
not sending 8bit mime parts */
if (!smtp_data (smtp_transport, message, has_8bit_parts, ex))
if (!smtp_data (smtp_transport, message, has_8bit_parts, ex)) {
camel_operation_end(NULL);
return FALSE;
}
/* reset the service for our next transfer session */
smtp_rset (smtp_transport, ex);
camel_operation_end(NULL);
return TRUE;
}
@ -654,6 +663,8 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
gchar *cmdbuf, *respbuf = NULL;
struct hostent *host;
camel_operation_start_transient(NULL, _("SMTP Greeting"));
/* get the local host name */
host = gethostbyaddr ((gchar *)&transport->localaddr.sin_addr, sizeof (transport->localaddr.sin_addr), AF_INET);
@ -676,6 +687,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("HELO request timed out: %s: non-fatal"),
g_strerror (errno));
camel_operation_end(NULL);
return FALSE;
}
g_free (cmdbuf);
@ -695,6 +707,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("HELO response error: %s: non-fatal"),
get_smtp_error_string (error));
camel_operation_end(NULL);
return FALSE;
}
@ -712,6 +725,8 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
}
} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */
g_free (respbuf);
camel_operation_end(NULL);
return TRUE;
}
@ -721,7 +736,7 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)
{
gchar *cmdbuf, *respbuf = NULL, *challenge;
CamelSasl *sasl;
sasl = camel_sasl_new ("smtp", mech, CAMEL_SERVICE (transport));
if (!sasl) {
g_free (respbuf);
@ -729,7 +744,9 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)
_("Error creating SASL authentication object."));
return FALSE;
}
camel_operation_start_transient(NULL, _("SMTP Authentication"));
challenge = camel_sasl_challenge_base64 (sasl, NULL, ex);
if (challenge) {
cmdbuf = g_strdup_printf ("AUTH %s %s\r\n", mech, challenge);
@ -771,7 +788,7 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)
challenge = camel_sasl_challenge_base64 (sasl, challenge, ex);
g_free (respbuf);
if (camel_exception_is_set (ex))
if (challenge == NULL)
goto break_and_lose;
/* send our challenge */
@ -794,7 +811,9 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)
g_free (respbuf);
goto lose;
}
camel_operation_end(NULL);
return TRUE;
break_and_lose:
@ -812,6 +831,8 @@ smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)
if (sasl)
camel_object_unref (CAMEL_OBJECT (sasl));
camel_operation_end(NULL);
return FALSE;
}