Monotone-Parent: 6661b82baa487cf8e72c04a8e31c6c05b7c58321

Monotone-Revision: 04b625432f61d61c8ad3468663a06f21d77e73f6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-31T00:53:37
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoDAVAuthenticator.h

@@ -42,9 +42,6 @@
 
 + (id) sharedSOGoDAVAuthenticator;
 
-- (SOGoUser *) userInContext: (WOContext *) _ctx;
-- (NSString *) passwordInContext: (WOContext *) context;
-
 @end
 
 #endif /* _SOGoDAVAuthenticator_H__ */

SoObjects/SOGo/SOGoProxyAuthenticator.h

@@ -41,13 +41,10 @@
 @class SOGoUser;
 
 // @interface SOGoProxyAuthenticator : SoHTTPAuthenticator <SOGoAuthenticator>
-@interface SOGoProxyAuthenticator : NSObject
+@interface SOGoProxyAuthenticator : NSObject <SOGoAuthenticator>
 
 + (id) sharedSOGoProxyAuthenticator;
 
-- (SOGoUser *) userInContext: (WOContext *) _ctx;
-- (NSString *) passwordInContext: (WOContext *) context;
-
 @end
 
 #endif /* _SOGoProxyAuthenticator_H__ */

SoObjects/SOGo/SOGoProxyAuthenticator.m

@@ -103,6 +103,13 @@
   return @"";
 }
 
+- (NSString *) imapPasswordInContext: (WOContext *) context
+                           forServer: (NSString *) imapServer
+                          forceRenew: (BOOL) renew
+{
+  return (renew ? nil : @"");
+}
+
 - (WOResponse *) preprocessCredentialsInContext: (WOContext *) context
 {
   WOResponse *r;

SoObjects/SOGo/SOGoWebAuthenticator.h

@@ -30,7 +30,7 @@
 
 @class SOGoUser;
 
-@interface SOGoWebAuthenticator : SoCookieAuthenticator
+@interface SOGoWebAuthenticator : SoCookieAuthenticator <SOGoAuthenticator>
 
 + (id) sharedSOGoWebAuthenticator;