Monotone-Parent: 7e6b126157fe6364467c441181458934b7c93347
Monotone-Revision: 1d50284cefca6f8926df742321e4f938e6a5b91f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-02T20:19:14 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
31bd407c54
commit
b54ddf24e9
|
@ -12,6 +12,11 @@
|
||||||
|
|
||||||
2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/Mailer/SOGoMailAccount.m (-updateFilters): we ensure
|
||||||
|
the active script is deactivated so that we can delete it on
|
||||||
|
Dovecot. This enables scripts to be deleted when all the filters
|
||||||
|
are disabled.
|
||||||
|
|
||||||
* UI/Scheduler/UIxCalListingActions.m
|
* UI/Scheduler/UIxCalListingActions.m
|
||||||
(_fillFreeBusy:forUid:fromDate:): fixed a crash occuring when the
|
(_fillFreeBusy:forUid:fromDate:): fixed a crash occuring when the
|
||||||
length of an event would happen after the period covered by the
|
length of an event would happen after the period covered by the
|
||||||
|
|
|
@ -1592,7 +1592,13 @@ Index: sope-mime/NGImap4/NGSieveClient.m
|
||||||
map = [self processCommand:s];
|
map = [self processCommand:s];
|
||||||
return [self normalizeResponse:map];
|
return [self normalizeResponse:map];
|
||||||
}
|
}
|
||||||
@@ -436,7 +438,7 @@
|
@@ -431,12 +433,12 @@
|
||||||
|
- (NSDictionary *)setActiveScript:(NSString *)_name {
|
||||||
|
NGHashMap *map;
|
||||||
|
|
||||||
|
- if (![self isValidScriptName:_name]) {
|
||||||
|
+ if (!_name) {
|
||||||
|
NSLog(@"%s: missing script-name", __PRETTY_FUNCTION__);
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
map = [self processCommand:
|
map = [self processCommand:
|
||||||
|
@ -3058,12 +3064,14 @@ Index: sope-mime/NGImap4/ChangeLog
|
||||||
===================================================================
|
===================================================================
|
||||||
--- sope-mime/NGImap4/ChangeLog (revision 1664)
|
--- sope-mime/NGImap4/ChangeLog (revision 1664)
|
||||||
+++ sope-mime/NGImap4/ChangeLog (working copy)
|
+++ sope-mime/NGImap4/ChangeLog (working copy)
|
||||||
@@ -1,3 +1,156 @@
|
@@ -1,3 +1,158 @@
|
||||||
+2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
+2010-04-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
+
|
+
|
||||||
+ * NGSieveClient.m (-putScript:script:):
|
+ * NGSieveClient.m (-putScript:script:):
|
||||||
+ (-setActiveScript, -deleteScript:): do not append an ending "\r\n"
|
+ (-setActiveScript:, -deleteScript:): do not append an ending "\r\n"
|
||||||
+ since sendCommand:logText: does it for us.
|
+ since sendCommand:logText: does it for us.
|
||||||
|
+ (-setActiveScript:): we accept an empty non-nil script name as
|
||||||
|
+ argument in order to deactivate the currently active script.
|
||||||
+
|
+
|
||||||
+2010-03-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
+2010-03-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
+
|
+
|
||||||
|
|
|
@ -373,6 +373,9 @@ static NSString *sieveScriptName = @"sogo";
|
||||||
return NO;
|
return NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* We ensure to deactive the current active script since it could prevent
|
||||||
|
its deletion from the server. */
|
||||||
|
result = [client setActiveScript: @""];
|
||||||
// We delete the existing Sieve script
|
// We delete the existing Sieve script
|
||||||
result = [client deleteScript: sieveScriptName];
|
result = [client deleteScript: sieveScriptName];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue