aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-04-28 03:36:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-04-28 20:22:22 +0800
commit0d3ef53bd7c1d7d96906f0f8348151a453e79078 (patch)
tree1964bc931216772980cb31afe989b62ca3d6f7fa /mail
parentfab97ac4cfde3511832be5079d7da909bdbc632f (diff)
downloadgsoc2013-evolution-0d3ef53bd7c1d7d96906f0f8348151a453e79078.tar.gz
gsoc2013-evolution-0d3ef53bd7c1d7d96906f0f8348151a453e79078.tar.zst
gsoc2013-evolution-0d3ef53bd7c1d7d96906f0f8348151a453e79078.zip
Commit the rest of the attachment UI rewrite
Oops, last commit only included the -new- files. This also removes EExpander, which is no longer used.
Diffstat (limited to 'mail')
-rw-r--r--mail/em-filter-i18n.h2
-rw-r--r--mail/em-popup.h2
-rw-r--r--mail/mail-component.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h
index 8b8d0c3323..c0b2925cc2 100644
--- a/mail/em-filter-i18n.h
+++ b/mail/em-filter-i18n.h
@@ -26,6 +26,7 @@ char *s = N_("Exist");
char *s = N_("exists");
char *s = N_("Expression");
char *s = N_("Follow Up");
+char *s = N_("Forward to");
char *s = N_("Important");
char *s = N_("is");
char *s = N_("is after");
@@ -46,6 +47,7 @@ char *s = N_("Message Body");
char *s = N_("Message Header");
char *s = N_("Message is Junk");
char *s = N_("Message is not Junk");
+char *s = N_("Message Location");
char *s = N_("Move to Folder");
char *s = N_("Pipe to Program");
char *s = N_("Play Sound");
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 4d075ec9f7..77f80e5599 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -50,7 +50,7 @@ enum _em_popup_target_t {
EM_POPUP_TARGET_SELECT,
EM_POPUP_TARGET_URI,
EM_POPUP_TARGET_PART,
- EM_POPUP_TARGET_FOLDER,
+ EM_POPUP_TARGET_FOLDER
};
/**
diff --git a/mail/mail-component.c b/mail/mail-component.c
index daeb1665cc..926f5716c9 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -92,6 +92,8 @@
#include "e-util/e-non-intrusive-error-dialog.h"
+#include "e-attachment-handler-mail.h"
+
#define MAILER_ERROR_LEVEL_KEY "/apps/evolution/mail/display/error_level"
#define MAILER_ERROR_TIME_OUT_KEY "/apps/evolution/mail/display/error_timeout"