aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-mt.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-03-09 11:31:24 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-03-09 11:31:24 +0800
commitf963cc39a7d21f64f578dae50fd08c44181a3bf6 (patch)
tree7cdf0c0c9bab037272ba6fca48aebbccd4c0de74 /mail/mail-mt.c
parent85d0142d21286ce87cd5f6c3d1e2f71aa994151f (diff)
downloadgsoc2013-evolution-f963cc39a7d21f64f578dae50fd08c44181a3bf6.tar.gz
gsoc2013-evolution-f963cc39a7d21f64f578dae50fd08c44181a3bf6.tar.zst
gsoc2013-evolution-f963cc39a7d21f64f578dae50fd08c44181a3bf6.zip
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
Diffstat (limited to 'mail/mail-mt.c')
-rw-r--r--mail/mail-mt.c13
1 files changed, 7 insertions, 6 deletions
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);
+ }
}