Revert merge from inverse

https://github.com/Zentyal/sogo/pull/150

Because the login on web with the use of outlook is broken after
including the DomainLessLogin feature

UI/PreferencesUI/UIxPreferences.h

@@ -44,6 +44,7 @@
   NSDictionary *calendarCategoriesColors;
   
   NSArray *contactsCategories;
+  NSString *defaultCategoryColor;
   NSCalendarDate *today;
 
   // Mail labels/tags

UI/PreferencesUI/UIxPreferences.m

@@ -128,6 +128,7 @@ static NSArray *reminderValues = nil;
 
       calendarCategories = nil;
       calendarCategoriesColors = nil;
+      defaultCategoryColor = nil;
       category = nil;
 
       label = nil;
@@ -174,6 +175,7 @@ static NSArray *reminderValues = nil;
   [vacationOptions release];
   [calendarCategories release];
   [calendarCategoriesColors release];
+  [defaultCategoryColor release];
   [category release];
   [label release];
   [mailLabels release];
@@ -1519,6 +1521,15 @@ 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;
 }