LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '92359dd58e30421ba90b8d9411ebae413f553836' 

and 'f2cb92adb8ead8e44b81938a9d331584b7752fe4'

Monotone-Parent: 92359dd58e30421ba90b8d9411ebae413f553836
Monotone-Parent: f2cb92adb8ead8e44b81938a9d331584b7752fe4
Monotone-Revision: c85488a496026efc268c07b0e8c84d1c1d1983d7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-19T14:52:55
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-02-19 14:52:55 +00:00
parent 65fcd2bde3 6513761609
commit fb12309ed4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-02-19 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-02-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m (-createFolderAction): we
check if the clientObject responds to "aboluteImap4Name",
otherwise the subscription is made to the folderName alone.
* Main/SOGo.m (-run): moved initialization logs from +initialize * Main/SOGo.m (-run): moved initialization logs from +initialize
here, so that they are output to the redirected output stream. here, so that they are output to the redirected output stream.
Added version number to "starting" line. Added version number to "starting" line.

12
UI/MailerUI/UIxMailFolderActions.m
View File

@ -38,7 +38,7 @@
#import <Mailer/SOGoMailObject.h> #import <Mailer/SOGoMailObject.h>
#import <SOGo/NSObject+Utilities.h> #import <SOGo/NSObject+Utilities.h>
#import <SOGo/SOGoUser.h> #import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserSettings.h> #import <SOGo/SOGoUserDefaults.h>
#import <UI/Common/WODirectAction+SOGo.h> #import <UI/Common/WODirectAction+SOGo.h>
@ -68,8 +68,11 @@
} }
else else
{ {
path = [NSString stringWithFormat: @"%@%@", if ([co respondsToSelector: @selector (absoluteImap4Name)])
[co absoluteImap4Name], folderName]; path = [NSString stringWithFormat: @"%@%@",
[co absoluteImap4Name], folderName];
else
path = folderName;
[[connection client] subscribe: path]; [[connection client] subscribe: path];
response = [self responseWith204]; response = [self responseWith204];
@ -133,7 +136,8 @@
else else
{ {
// We unsubscribe to the old one, and subscribe back to the new one // We unsubscribe to the old one, and subscribe back to the new one
if ([[[context activeUser] userDefaults] mailShowSubscribedFoldersOnly]) if ([[[context activeUser] userDefaults]
mailShowSubscribedFoldersOnly])
{ {
[[connection client] subscribe: [destURL path]]; [[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]]; [[connection client] unsubscribe: [srcURL path]];