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

Handle exceptions a little nicer and pop up a nice GnomeDialog with the

Browse Source 
2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (build_message): Handle exceptions a little
	nicer and pop up a nice GnomeDialog with the error message - also,
	don't return a CamelMimeMessage if it fails to sign/decrypt
	because we want to let the user decide what to do based on the
	error message he/she gets.

svn path=/trunk/; revision=8296
This commit is contained in:
Jeffrey Stedfast
2001-02-20 00:42:28 +00:00
committed by Jeffrey Stedfast
parent 72bc2233d2
commit 8c481ff34d
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer/ChangeLog
View File

@ -1,3 +1,11 @@
2001-02-19 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (build_message): Handle exceptions a little
nicer and pop up a nice GnomeDialog with the error message - also,
don't return a CamelMimeMessage if it fails to sign/decrypt
because we want to let the user decide what to do based on the
error message he/she gets.
2001-02-15 Dan Winship <danw@ximian.com>
* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account): If

31
composer/e-msg-composer.c
View File

@ -245,6 +245,7 @@ build_message (EMsgComposer *composer)
CamelMultipart *body = NULL;
CamelMimePart *part;
gboolean plain_e8bit = FALSE, html_e8bit = FALSE;
CamelException ex;
char *html = NULL, *plain = NULL;
char *content_type = NULL;
int i;
@ -411,9 +412,10 @@ build_message (EMsgComposer *composer)
}
}
camel_exception_init (&ex);
if (composer->pgp_sign) {
/* FIXME: should use the PGP key id rather than email address */
CamelException ex;
const char *pgpid;
camel_exception_init (&ex);
@ -422,16 +424,14 @@ build_message (EMsgComposer *composer)
pgp_mime_part_sign (&part, pgpid, PGP_HASH_TYPE_SHA1,
&ex);
camel_object_unref (CAMEL_OBJECT (from));
if (camel_exception_is_set (&ex)) {
g_warning ("EEEEEEEEEEEEEEEEEEEEEEKKKKKKKKKKKKKKK!!!");
}
if (camel_exception_is_set (&ex))
goto exception;
}
if (composer->pgp_encrypt) {
/* FIXME: recipients should be an array of key ids rather than email addresses */
const CamelInternetAddress *addr;
const char *address;
CamelException ex;
GPtrArray *recipients;
int i, len;
@ -463,9 +463,8 @@ build_message (EMsgComposer *composer)
for (i = 0; i < recipients->len; i++)
g_free (recipients->pdata[i]);
g_ptr_array_free (recipients, TRUE);
if (camel_exception_is_set (&ex)) {
g_warning ("EEEEEEEEEEEEEEEEEEEEEEKKKKKKKKKKKKKKK!!!");
}
if (camel_exception_is_set (&ex))
goto exception;
}
camel_medium_set_content_object (CAMEL_MEDIUM (new),
@ -473,6 +472,22 @@ build_message (EMsgComposer *composer)
camel_object_unref (CAMEL_OBJECT (part));
return new;
exception:
camel_object_unref (CAMEL_OBJECT (part));
camel_object_unref (CAMEL_OBJECT (new));
if (camel_exception_is_set (&ex)) {
GtkWidget *dialog;
dialog = gnome_error_dialog_parented (camel_exception_get_description (&ex),
GTK_WINDOW (composer));
gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
camel_exception_clear (&ex);
}
return NULL;
}
static char *