amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-05 23:13:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse"

Browse Source 
This reverts commit 1404dbdb88, reversing
changes made to 72cbd9a45f.
This commit is contained in:
Julio García
2015-08-03 09:48:06 +02:00
parent 0ce04fd4b6
commit 26bd1b30fa
41 changed files with 774 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/UIxPreferences.m
-11
View File
@@ -128,7 +128,6 @@ static NSArray *reminderValues = nil;
calendarCategories = nil;
calendarCategoriesColors = nil;
defaultCategoryColor = nil;
category = nil;
label = nil;
@@ -175,7 +174,6 @@ static NSArray *reminderValues = nil;
[vacationOptions release];
[calendarCategories release];
[calendarCategoriesColors release];
[defaultCategoryColor release];
[category release];
[label release];
[mailLabels release];
@@ -1521,15 +1519,6 @@ static NSArray *reminderValues = nil;
ASSIGN (calendarCategoriesColors, [userDefaults calendarCategoriesColors]);
categoryColor = [calendarCategoriesColors objectForKey: category];
if (!categoryColor)
{
if (!defaultCategoryColor)
{
dd = [[context activeUser] domainDefaults];
ASSIGN (defaultCategoryColor, [dd calendarDefaultCategoryColor]);
}
categoryColor = defaultCategoryColor;
}
return categoryColor;
}