gunnar: server/horde/horde-kronolith HK-GW-Kolab_issue_2138.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 horde-kronolith-kolab.spec, 1.16, 1.17

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv6074/horde-kronolith

Modified Files:
	ChangeLog horde-kronolith-kolab.spec 
Added Files:
	HK-GW-Kolab_issue_2138.patch 
Log Message:
kolab/issue2138

--- NEW FILE: HK-GW-Kolab_issue_2138.patch ---
The kronolith part of issue 2138.

diff -r 7dfda4d79222 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Wed Nov 07 17:49:30 2007 +0100
+++ b/kronolith/lib/Driver/kolab.php	Wed Nov 07 18:00:52 2007 +0100
@@ -1041,7 +1041,10 @@ class Kronolith_Driver_kolab_wrapper_new
             return PEAR::raiseError(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->_driver->_calendar));
         }
 
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         if ($this->_store->objectUidExists($uid)) {
             return $uid;
@@ -1063,7 +1066,10 @@ class Kronolith_Driver_kolab_wrapper_new
      */
     function listEvents($startDate = null, $endDate = null, $hasAlarm = false)
     {
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         if (is_null($startDate)) {
             $startDate = &new Horde_Date(array('mday' => 1, 'month' => 1, 'year' => 0000));
@@ -1112,7 +1118,10 @@ class Kronolith_Driver_kolab_wrapper_new
             return $event;
         }
 
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         if (array_key_exists($eventId, $this->_events_cache)) {
             return $this->_events_cache[$eventId];
@@ -1158,7 +1167,10 @@ class Kronolith_Driver_kolab_wrapper_new
      */
     function saveEvent(&$event)
     {
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         $uid = $event->getUID();
         if ($uid == null) {
@@ -1195,7 +1207,10 @@ class Kronolith_Driver_kolab_wrapper_new
      */
     function move($eventId, $newCalendar)
     {
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         global $kronolith_shares;
         $target = &$kronolith_shares->getShare($newCalendar);
@@ -1223,7 +1238,10 @@ class Kronolith_Driver_kolab_wrapper_new
      */
     function deleteEvent($eventId)
     {
-        $this->synchronize();
+        $result = $this->synchronize();
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         if (!$this->_store->objectUidExists($eventId)) {
             return PEAR::raiseError(sprintf(_("Event not found: %s"), $eventId));

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	20 Jul 2007 11:19:08 -0000	1.3
+++ ChangeLog	19 Nov 2007 19:41:01 -0000	1.4
@@ -1,3 +1,9 @@
+2007-11-19  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kronolith-kolab.spec:
+
+	kolab/issue2138 (Horde creates events in main inbox)
+
 2007-07-19  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kronolith-kolab.spec: Update to 20070719

Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- horde-kronolith-kolab.spec	4 Oct 2007 09:47:55 -0000	1.16
+++ horde-kronolith-kolab.spec	19 Nov 2007 19:41:01 -0000	1.17
@@ -2,8 +2,8 @@
 %define         V_horde_name kronolith
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 10
-%define         V_day   04
+%define         V_month 11
+%define         V_day   19
 %define         V_version 2.2_alpha
 %define         V_uver    2.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -30,6 +30,7 @@
 Patch0:         HK-GW-Fix_create_new_event.patch
 Patch1:         HK-GW-Fix_share_right_editing.patch
 Patch2:         HK-UV-Fix_list_events.patch
+Patch3:         HK-GW-Kolab_issue_2138.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -62,6 +63,7 @@
 	%patch -p2 -P 0
 	%patch -p2 -P 1
 	%patch -p2 -P 2
+	%patch -p2 -P 3
 	cd ..
 
 %build