[Xfce4-commits] <postler:master> Add 'reply' and 'organization' fields for IMAP accounts

[Christian Dywan]

Updating branch refs/heads/master
         to b510eb83c069e94a9ac89b412ffa94f9cb04c277 (commit)
       from 9ef3521a1afc5c4c3e7bc4ac5648f00862e9c7cb (commit)

commit b510eb83c069e94a9ac89b412ffa94f9cb04c277
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jul 9 23:01:49 2010 +0200

    Add 'reply' and 'organization' fields for IMAP accounts

 postler/postler-accounts.vala |    6 ++++++
 postler/postler-composer.vala |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 89dea25..6b0a42d 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -29,6 +29,8 @@ namespace Postler {
         public string path;
         public string certificate;
         public string sync;
+        public string reply;
+        public string organization;
         public string hide;
     }
 }
@@ -127,6 +129,10 @@ public class Postler.Accounts : GLib.Object {
                         info.certificate = keyfile.get_string (group, "certificate");
                     if (keyfile.has_key (group, "sync"))
                         info.sync = keyfile.get_string (group, "sync");
+                    if (keyfile.has_key (group, "reply"))
+                        info.reply = keyfile.get_string (group, "reply");
+                    if (keyfile.has_key (group, "organization"))
+                        info.organization = keyfile.get_string (group, "organization");
                     if (keyfile.has_key (group, "hide"))
                         info.hide = keyfile.get_string (group, "hide");
                 }
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 31e4ed3..b33d441 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -96,7 +96,11 @@ public class Postler.Composer : Gtk.Window {
                 string header = ("From: %s\nTo: %s\n%s%s"
                     + "MIME-Version: 1.0\nContent-Transfer-Encoding: 8bit\n"
                     + "Content-Type: text/plain; charset=UTF-8\n"
-                    + "Subject: %s\nDate: %s\nX-Mailer: %s\n\n").printf (
+                    + "Subject: %s\nDate: %s\nX-Mailer: %s\n"
+                    + (info.reply != null ? "Reply-To: " + info.reply + "\n" : "")
+                    + (info.organization != null ?
+                        "Organization: " + info.organization + "\n" : "")
+                    + "\n").printf (
                         sender,
                         entry_to.text,
                         copy != "" ? "CC: " : "", copy != "" ? copy + "\n" : "",