aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2003-01-03 04:05:58 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-01-03 04:05:58 +0800
commit6221468fa0386f70d5798d21cfaf39b6d1641d14 (patch)
tree84a1e6fe5d2d8189ecd66b8f7399cace09a50b52 /composer
parent0655a2b8fd553e7e335acb4def964b60f2dda247 (diff)
downloadgsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar.gz
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar.bz2
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar.lz
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar.xz
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.tar.zst
gsoc2013-evolution-6221468fa0386f70d5798d21cfaf39b6d1641d14.zip
fixes
svn path=/trunk/; revision=19206
Diffstat (limited to 'composer')
-rw-r--r--composer/Makefile.am2
-rw-r--r--composer/e-msg-composer.c15
2 files changed, 5 insertions, 12 deletions
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 0f893f46a8..e656d9cd3d 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -71,7 +71,7 @@ INCLUDES = \
-DEVOLUTION_ICONSDIR=\"$(iconsdir)\" \
-DE_GLADEDIR=\"$(gladedir)\" \
-DG_LOG_DOMAIN=\"composer\" \
- $(GNOME_FULL_CFLAGS)
+ $(EVOLUTION_MAIL_CFLAGS)
libcomposer_a_SOURCES = \
$(IDL_GENERATED) \
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index c6ba4d0222..f47f3ae08c 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -79,10 +79,9 @@
#include "camel/camel-charset-map.h"
#include "camel/camel-session.h"
-#warning "need to re-add mail.h"
-/*#include "mail.h"*/
#include "mail/mail-callbacks.h"
#include "mail/mail-crypto.h"
+#include "mail/mail-format.h"
#include "mail/mail-tools.h"
#include "mail/mail-ops.h"
#include "mail/mail-mt.h"
@@ -3134,9 +3133,7 @@ handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int
} else if (header_content_type_is (content_type, "text", "*")) {
char *text;
- text = mail_get_message_body (content, FALSE, FALSE);
-
- if (text)
+ if ((text = mail_get_message_body (content, FALSE, FALSE)))
e_msg_composer_set_pending_body (composer, text);
} else {
e_msg_composer_attach (composer, mime_part);
@@ -3193,9 +3190,7 @@ handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, i
} else if (header_content_type_is (content_type, "text", "*")) {
char *text;
- text = mail_get_message_body (content, FALSE, FALSE);
-
- if (text)
+ if ((text = mail_get_message_body (content, FALSE, FALSE)))
e_msg_composer_set_pending_body (composer, text);
} else {
e_msg_composer_attach (composer, mime_part);
@@ -3256,9 +3251,7 @@ handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart,
char *text;
contents = camel_medium_get_content_object (CAMEL_MEDIUM (text_part));
- text = mail_get_message_body (contents, FALSE, FALSE);
-
- if (text)
+ if ((text = mail_get_message_body (contents, FALSE, FALSE)))
e_msg_composer_set_pending_body (composer, text);
}
}