Monotone-Parent: 37f12ad4f4daf31d2b81f43a8d21b5c4a53f4a1d

Monotone-Revision: 9e9ae5751a1a008c8b1986bd933c97f02aa65760

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-02T20:03:13
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-02 20:03:13 +00:00
parent 95cdd86021
commit af23614cef
1 changed files with 29 additions and 4 deletions

View File

@ -1580,18 +1580,37 @@ Index: sope-mime/NGImap4/NGSieveClient.m
buf[logLen] = '\0';
buf[logLen * 2 + 1] = '\0';
@@ -422,7 +423,9 @@
@@ -422,8 +423,9 @@
s = @"PUTSCRIPT \"";
s = [s stringByAppendingString:_name];
s = [s stringByAppendingString:@"\" "];
- s = [s stringByAppendingFormat:@"{%d+}\r\n%@", [_script length], _script];
- s = [s stringByAppendingString:@"\r\n"];
+ s = [s stringByAppendingFormat:@"{%d+}\r\n%@",
+ [_script lengthOfBytesUsingEncoding: NSUTF8StringEncoding],
+ _script];
s = [s stringByAppendingString:@"\r\n"];
map = [self processCommand:s];
return [self normalizeResponse:map];
@@ -656,7 +659,7 @@
}
@@ -436,7 +438,7 @@
return nil;
}
map = [self processCommand:
- [NSString stringWithFormat:@"SETACTIVE \"%@\"\r\n", _name]];
+ [NSString stringWithFormat:@"SETACTIVE \"%@\"", _name]];
return [self normalizeResponse:map];
}
@@ -449,7 +451,7 @@
return nil;
}
- s = [NSString stringWithFormat:@"DELETESCRIPT \"%@\"\r\n", _name];
+ s = [NSString stringWithFormat:@"DELETESCRIPT \"%@\"", _name];
map = [self processCommand:s];
return [self normalizeResponse:map];
}
@@ -656,7 +658,7 @@
fputc('\n', stderr);
}
else
@ -3039,7 +3058,13 @@ Index: sope-mime/NGImap4/ChangeLog
===================================================================
--- sope-mime/NGImap4/ChangeLog (revision 1664)
+++ sope-mime/NGImap4/ChangeLog (working copy)
@@ -1,3 +1,150 @@
@@ -1,3 +1,156 @@
+2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
+
+ * NGSieveClient.m (-putScript:script:):
+ (-setActiveScript, -deleteScript:): do not append an ending "\r\n"
+ since sendCommand:logText: does it for us.
+
+2010-03-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
+
+ * NGImap4ResponseParser.m (_parseContentSieveResponse): we now use