src/strip.vala

[app.mailtrimmer] / src / strip.vala
diff --git a/src/strip.vala b/src/strip.vala

index 306b747..52e2cb3 100644 (file)
--- a/src/strip.vala
+++ b/src/strip.vala
@@ -385,7 +385,7 @@ public class Strip : GLib.Object {
         
         // initialize it with known data..
         // that should wipe out dupes.
-       var filesize = this.execute("SELECT filesize FROM Attachment WHERE id = %d".printf(
+       var filesize = this.query("SELECT filesize FROM Attachment WHERE id = %d".printf(
                         int.parse(sid)));  
  
                 if (filesize=="") {      
@@ -647,14 +647,14 @@ public class Strip : GLib.Object {
          string txt = "<html><body>"+
              "<a href=\"" + StripApplication.opt_replace_link + "/" +
                         file_id + "/" + this.created_dir + "/"+chksum+"/"+ GLib.Uri.escape_string( filename, "", false) +"\">" + 
-            GLib.Uri.escape_string( filename) + // fixme needs html escaping...
+            GLib.Uri.escape_string( filename, "", false) + // fixme needs html escaping...
              "</a>" +
              "</body></html>";
  
          rep.get_content_type().set_parameter("charset", "utf-8");
                 rep.set_header("X-strip-id", file_id);
                 rep.set_header("X-strip-content-name",  filename);                              
-               rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" + filename);              
+               rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" +  GLib.Uri.escape_string(filename,"", false));           
                 rep.set_header("X-strip-content-type", mime_type);              
          var stream =  new GMime.StreamMem.with_buffer(txt.data);
          var con = new GMime.DataWrapper.with_stream(stream,GMime.ContentEncoding.DEFAULT);