Fixed compilation warnings

Monotone-Parent: 7ac5d165aefe44d7baf56c60ea6bdd8b100d1675
Monotone-Revision: 4448ade7ffcea5cb2a735cfc2c14ca9588596303

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-08-25T17:51:20
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-08-25 17:51:20 +00:00
parent 2723e6ffeb
commit a67635d70c
5 changed files with 10 additions and 7 deletions

View File

@ -147,6 +147,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (NSArray *) rolesForObject: (NSObject *) object - (NSArray *) rolesForObject: (NSObject *) object
inContext: (WOContext *) context; inContext: (WOContext *) context;
- (void) migrateSignature;
@end @end
#endif /* __SOGoUser_H__ */ #endif /* __SOGoUser_H__ */

View File

@ -43,6 +43,8 @@
- (WOResponse *) saveDragHandleStateAction; - (WOResponse *) saveDragHandleStateAction;
- (BOOL) isPopup;
@end @end
#endif /* UIXCONTACTFOLDERSVIEW_H */ #endif /* UIXCONTACTFOLDERSVIEW_H */

View File

@ -357,18 +357,18 @@
- (void) checkDefaultModulePreference - (void) checkDefaultModulePreference
{ {
NSUserDefaults *ud; NSUserDefaults *clientUD;
NSString *pref; NSString *pref;
if (![self isPopup]) if (![self isPopup])
{ {
ud = [[context activeUser] userDefaults]; clientUD = [[context activeUser] userDefaults];
pref = [ud stringForKey: @"SOGoUIxDefaultModule"]; pref = [clientUD stringForKey: @"SOGoUIxDefaultModule"];
if (pref && [pref isEqualToString: @"Last"]) if (pref && [pref isEqualToString: @"Last"])
{ {
[ud setObject: @"Contacts" forKey: @"SOGoUIxLastModule"]; [clientUD setObject: @"Contacts" forKey: @"SOGoUIxLastModule"];
[ud synchronize]; [clientUD synchronize];
} }
} }
} }

View File

@ -28,6 +28,7 @@
#import <NGObjWeb/WOContext.h> #import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOResponse.h> #import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSString+misc.h> #import <NGExtensions/NSString+misc.h>
#import <NGExtensions/NSNull+misc.h>
#import <Contacts/SOGoContactObject.h> #import <Contacts/SOGoContactObject.h>
#import <Contacts/SOGoContactFolder.h> #import <Contacts/SOGoContactFolder.h>

View File

@ -569,8 +569,6 @@ static BOOL defaultShowSubscribedFoldersOnly = NO;
- (NSString *) signature - (NSString *) signature
{ {
NSString *signature;
[user migrateSignature]; [user migrateSignature];
return [userDefaults stringForKey: @"MailSignature"]; return [userDefaults stringForKey: @"MailSignature"];
} }