From 60502d4763b09ea169fb82e80e345c4c280db87f Mon Sep 17 00:00:00 2001
From: Thomas <thomas@brotherli.ch>
Date: Fri, 30 Sep 2011 17:28:29 +0200
Subject: [PATCH] Use folder annotations to save calendar colors according to
 KEP #12

---
 plugins/calendar/drivers/kolab/kolab_calendar.php | 3 +--
 plugins/calendar/drivers/kolab/kolab_driver.php   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 2e1f75af..19dceffd 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -155,11 +155,10 @@ class kolab_calendar
   {
     // color is defined in folder METADATA
     // FIXME: Kolab_Folder::getKolabAttribute() only reads value.shared; value.priv should be considered first
-/* DISABLED until KEP #12 is approved
     if ($color = $this->storage->_folder->getKolabAttribute('color')) {
       return $color;
     }
-*/
+
     // calendar color is stored in user prefs (temporary solution)
     $prefs = $this->cal->rc->config->get('kolab_calendars', array());
 
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 9363c1a5..4902f7ab 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -318,14 +318,14 @@ class kolab_driver extends calendar_driver
 
     // save color in METADATA
     // TODO: also save 'showalarams' and other properties here
-/* DISABLED until KEP #12 is approved
+
     if ($result && $prop['color']) {
       if (!($meta_saved = $this->rc->imap->set_metadata($folder, array('/shared/vendor/kolab/color' => $prop['color']))))  // try in shared namespace
         $meta_saved = $this->rc->imap->set_metadata($folder, array('/private/vendor/kolab/color' => $prop['color']));    // try in private namespace
       if ($meta_saved)
         unset($prop['color']);  // unsetting will prevent fallback to local user prefs
     }
-*/
+
     return $result ? $folder : false;
   }