# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1400188532 -7200
# Node ID 30af94b979f757bf60262794f0a0bb97e03baeb6
# Parent  e1c13cca9bcc5d55ee23174a3b7831373bab719c
Added a patch to fix GETMETADATA usage with Cyrus, hopefully fixed upstream.

diff -r e1c13cca9bcc -r 30af94b979f7 debian/patches/kimap-always-options.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/kimap-always-options.diff	Thu May 15 23:15:32 2014 +0200
@@ -0,0 +1,41 @@
+Description: Always specify options to GETMETADATA.
+ Some IMAP servers (Cyrus, apparently) insist on receiving options.
+ This patch adds the apparently mandatory DEPTH option.
+
+--- a/kimap/getmetadatajob.cpp
++++ b/kimap/getmetadatajob.cpp
+@@ -88,15 +88,11 @@
+       parameters.truncate(parameters.length() -1);
+ 
+   } else {
+-    if (d->depth != "0") {
+-      parameters += "(DEPTH " + d->depth;
+-    }
++    parameters += "(DEPTH " + d->depth;
+     if (d->maxSize != -1) {
+-      parameters += "(MAXSIZE " + QByteArray::number(d->maxSize) + ')';
+-    }
+-    if (d->depth != "0") {
+-      parameters += " )";
++      parameters += " MAXSIZE " + QByteArray::number(d->maxSize);
+     }
++    parameters += ") ";
+ 
+     if (d->entries.size() > 1)
+       parameters += '(';
+@@ -105,6 +101,8 @@
+     }
+     if (d->entries.size() > 1)
+       parameters[parameters.length() -1 ] = ')';
++    else
++      parameters.truncate(parameters.length() -1);
+   }
+ 
+   if (d->entries.isEmpty()) {
+@@ -209,4 +207,4 @@
+   return d->metadata[mailBox];
+ }
+ 
+-#include "getmetadatajob.moc"
+\ No newline at end of file
++#include "getmetadatajob.moc"
diff -r e1c13cca9bcc -r 30af94b979f7 debian/patches/series
--- a/debian/patches/series	Sat Mar 01 15:28:57 2014 +0100
+++ b/debian/patches/series	Thu May 15 23:15:32 2014 +0200
@@ -1,1 +0,0 @@
-fix-imap-lockups.patch