From 3f9aedc3f3e8fe50bdb1ed8183b879534ae666f2 Mon Sep 17 00:00:00 2001
From: "Aleksander Machniak (Kolab Systems)" <machniak@kolabsys.com>
Date: Tue, 5 Jul 2011 11:20:08 +0200
Subject: [PATCH 1/2] Don't bind to 'save-pref' action for better performance

---
 plugins/calendar/calendar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index effa7099..8512972a 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -33,7 +33,7 @@ class calendar extends rcube_plugin
 
   public $ical;
   public $ui;
-  
+
   public $defaults = array(
     'calendar_default_view' => "agendaWeek",
     'calendar_date_format'  => "yyyy-MM-dd",
@@ -92,7 +92,7 @@ class calendar extends rcube_plugin
       $this->include_stylesheet('skins/' . $skin . '/calendar.css');
     }
 
-    if ($this->rc->task == 'calendar') {
+    if ($this->rc->task == 'calendar' && $this->rc->action != 'save-pref') {
       $this->load_driver();
 
       // load iCalendar functions

From ecfd861c127b318912108d151c5536de76a391e3 Mon Sep 17 00:00:00 2001
From: "Aleksander Machniak (Kolab Systems)" <machniak@kolabsys.com>
Date: Tue, 5 Jul 2011 11:41:22 +0200
Subject: [PATCH 2/2] Enable groups for readonly folders

---
 plugins/kolab_addressbook/lib/rcube_kolab_contacts.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index a19baec6..feca0eb7 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -15,7 +15,7 @@ class rcube_kolab_contacts extends rcube_addressbook
     public $primary_key = 'ID';
     public $readonly = true;
     public $editable = false;
-    public $groups = false;
+    public $groups = true;
     public $coltypes = array(
       'name'         => array('limit' => 1),
       'firstname'    => array('limit' => 1),
@@ -133,9 +133,6 @@ class rcube_kolab_contacts extends rcube_addressbook
                 if (strpos($acl, 'a') !== false || strpos($acl, 'x') !== false)
                     $this->editable = true;
             }
-
-            if (!$this->readonly)
-                $this->groups = true;
         }
     }