[Xfce4-commits] <postler:master> Start replies with 'On %s, %s wrote:' style sentence

[Christian Dywan]

Updating branch refs/heads/master
         to 6ebf8cff7e66bdeeaa80c02c1088f68f306f62b1 (commit)
       from 566f902470fbb0e962cf6ae4a102864877b78af1 (commit)

commit 6ebf8cff7e66bdeeaa80c02c1088f68f306f62b1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jul 8 21:20:19 2010 +0200

    Start replies with 'On %s, %s wrote:' style sentence

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

diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 3794483..31e4ed3 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -314,7 +314,7 @@ public class Postler.Composer : Gtk.Window {
     }
 
     public bool prepare_reply (string? location=null, bool quote=false) {
-        return content.prepare_reply (location, quote);
+        return content.prepare_reply (location, entry_to.text, quote);
     }
 
     public bool add_field (string field, string data) {
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index ecb2887..9db20c2 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -289,10 +289,14 @@ public class Postler.Content : WebKit.WebView {
         return "";
     }
 
-    public bool prepare_reply (string? location, bool quote) {
+    public bool prepare_reply (string? location, string recipient, bool quote) {
         var body = new StringBuilder ();
 
         if (location != null) {
+            ulong now = new Soup.Date.from_now (0).to_time_t ();
+            string date = GLib.Time.local ((time_t)now).format ("%x %X");
+            body.append_printf (_("On %s, %s wrote:"), date, recipient);
+            body.append_c ('\n');
             var contents = File.new_for_path (location);
             try {
                 var stream = new DataInputStream (contents.read (null));