From f963cc39a7d21f64f578dae50fd08c44181a3bf6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 9 Mar 2009 03:31:24 +0000 Subject: Cleaning up the attachment bar, centralizing its popup menu, and converting everything to GtkUIManager/GtkActions. Saving progress mid-stream... not sure about the MIME part utilities yet. Also, add some EActivity subclasses. Considering an EFileActivity subclass for asynchronous GIO operations (loading/saving attachments, etc.), but still ironing out details. svn path=/branches/kill-bonobo/; revision=37389 --- mail/mail-mt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'mail/mail-mt.c') diff --git a/mail/mail-mt.c b/mail/mail-mt.c index f4780c96bb..b246cd2899 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -37,7 +37,7 @@ #include "misc/e-gui-utils.h" #include "e-util/e-error.h" #include "e-util/e-icon-factory.h" -#include "widgets/misc/e-activity.h" +#include "widgets/misc/e-alert-activity.h" #include "mail-config.h" #include "mail-session.h" @@ -145,12 +145,13 @@ end_event_callback (CamelObject *o, EActivity *activity, void *error) if (error == NULL) { e_activity_complete (activity); g_object_unref (activity); - } else if (activity == NULL) { - activity = e_activity_new (NULL); - e_activity_error (activity, error); + } else { + if (activity != NULL) + g_object_unref (activity); + activity = e_alert_activity_new_warning (error); e_shell_module_add_activity (mail_shell_module, activity); - } else - e_activity_error (activity, error); + g_object_unref (activity); + } } -- cgit v1.2.3