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

Fix for bug #2106

pull/7/head
Ludovic Marcotte 2012-11-17 15:33:07 -05:00
parent 378eef4082
commit 77e4b3307f
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SOPE/NGCards/CardElement.m
View File

@ -424,16 +424,19 @@
} }
static inline BOOL static inline BOOL
_subValuesAreVoid (NSArray *subValues) _subValuesAreVoid (id subValues)
{ {
BOOL result = YES; BOOL result = YES;
NSUInteger count, max; NSUInteger count, max;
result = YES; result = YES;
max = [subValues count]; if ([subValues isKindOfClass: [NSArray class]])
for (count = 0; result && count < max; count++) {
result = ([[subValues objectAtIndex: count] length] == 0); max = [subValues count];
for (count = 0; result && count < max; count++)
result = ([[subValues objectAtIndex: count] length] == 0);
}
return result; return result;
} }

3
SoObjects/Contacts/NGVCard+SOGo.m
View File

@ -303,7 +303,8 @@ convention:
forKey: @""]; forKey: @""];
[self setNote: [ldifRecord objectForKey: @"description"]]; [self setNote: [ldifRecord objectForKey: @"description"]];
[self setCategories: [ldifRecord objectForKey: @"vcardcategories"]]; [self setCategories: [[ldifRecord objectForKey: @"vcardcategories"]
componentsSeparatedByString: @","]];
[self cleanupEmptyChildren]; [self cleanupEmptyChildren];
} }

2
SoObjects/Contacts/NSDictionary+LDIF.m
View File

@ -1,6 +1,6 @@
/* NSDictionary+LDIF.m - this file is part of SOGo /* NSDictionary+LDIF.m - this file is part of SOGo
* *
* Copyright (C) 2011 Inverse inc * Copyright (C) 2011-2012 Inverse inc
* *
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca> * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* *

2
SoObjects/Contacts/SOGoContactLDIFEntry.m
View File

@ -1,6 +1,6 @@
/* SOGoContactLDIFEntry.m - this file is part of SOGo /* SOGoContactLDIFEntry.m - this file is part of SOGo
* *
* Copyright (C) 2006-2011 Inverse inc. * Copyright (C) 2006-2012 Inverse inc.
* *
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca> * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Ludovic Marcotte <lmarcotte@inverse.ca> * Ludovic Marcotte <lmarcotte@inverse.ca>

7
UI/Contacts/UIxContactFolderActions.m
View File

@ -1,14 +1,15 @@
/* /*
Copyright (C) 2004-2005 SKYRIX Software AG Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2006-2012 Inverse inc.
This file is part of OpenGroupware.org. This file is part of SOGo
OGo is free software; you can redistribute it and/or modify it under SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any Free Software Foundation; either version 2, or (at your option) any
later version. later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details. License for more details.