Merge branch 'master' into 'master'

[kcalcore] fixes vcalendar export for MER#1604 See merge request !2
sailfishos · Sep 13, 2016 · 7db97a5 · 7db97a5
2 parents eaccc25 + fe425c2
commit 7db97a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/kcalcore/klibport/kcodecs.cpp b/kcalcore/klibport/kcodecs.cpp
@@ -231,10 +231,11 @@ void KCodecs::quotedPrintableEncode(const QByteArray& in, QByteArray& out, bool
         ++lineLength;
       }
     }
-    // If we find a line break, just let it through.
+    // If we find a line break, just don't let it through.
     else if ((useCRLF && ('\r' == c) && (i < end) && ('\n' == data[i + 1])) ||
              (!useCRLF && ('\n' == c)))
     {
+      cursor += sprintf(cursor, "=0D=0A=");
       lineLength = 0;
 
       if (useCRLF) {

diff --git a/kcalcore/versit/vobject.c b/kcalcore/versit/vobject.c
@@ -1147,23 +1147,12 @@ static int writeBase64(OFile *fp, unsigned char *s, unsigned long len)
     return 1;
 }
 
-/* this function really sucks.  Too basic. */
+/* this function really sucks.  Too basic. ORLY? */
 static void writeQPString(OFile *fp, const char *s, int qp)
 {
     const char *p = s;
     while (*p) {
-      if (*p == '\n') {
-        /* According to VCAL-1.0 doc, CRLF is the correct separator */
-        appendsOFile(fp,"=0D=0A=");
-        /* Continued to also add the \n below */
-      }
-      if (*p == '\r') {
-        /* NOP, handled above [our own may or may not have \rs] */
-      }
-      else if (*p == '=' && qp)
-	appendsOFile(fp,"=3D");
-      else
-	appendcOFile(fp,*p);
+      appendcOFile_(fp,*p);
       p++;
     }
 }