aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-composer-utils.c6
-rw-r--r--mail/mail-config.glade8
-rw-r--r--mail/mail-config.h3
4 files changed, 24 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 587ec8b13a..1588482ed8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-02 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Outlook style reply option for bug #415770 from gicmo
+
+ * em-composer-utils.c: (composer_set_body):
+ * mail-config.glade:
+ * mail-config.h:
+
2007-06-01 Karl Relton <karllinuxtest.relton@ntlworld.com>
** Fix for bug #311512
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 0334783f95..529b828908 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1849,6 +1849,12 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
e_msg_composer_attach (composer, part);
camel_object_unref (part);
break;
+ case MAIL_CONFIG_REPLY_OUTLOOK:
+ text = em_utils_message_to_html(message, _("-----Original Message-----"), EM_FORMAT_QUOTE_HEADERS, &len, source);
+ e_msg_composer_set_body_text(composer, text, len);
+ g_free (text);
+ break;
+
case MAIL_CONFIG_REPLY_QUOTED:
default:
/* do what any sane user would want when replying... */
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 0fe68716c8..d015fad9e4 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -7220,6 +7220,14 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<property name="use_underline">True</property>
</widget>
</child>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget50">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Inline original message (Outlook style)</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
</widget>
</child>
</widget>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 7a436b2ca1..06f3f41f63 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -69,7 +69,8 @@ typedef enum {
typedef enum {
MAIL_CONFIG_REPLY_QUOTED,
MAIL_CONFIG_REPLY_DO_NOT_QUOTE,
- MAIL_CONFIG_REPLY_ATTACH
+ MAIL_CONFIG_REPLY_ATTACH,
+ MAIL_CONFIG_REPLY_OUTLOOK
} MailConfigReplyStyle;
typedef enum {