[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kresources/kolab/kcal
From:       Allen Winter <winter () kde ! org>
Date:       2010-03-19 13:52:03
Message-ID: 20100319135204.02D3DAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1105191 by winterz:

handle empty or illegal recurrence interval values that may have been
incorrectly written into a Kolab incidence (possibly by proko2/resmgr)
kolab/issue4229
MERGE: trunk,4.4


 M  +8 -2      incidence.cpp  


--- branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/incidence.cpp #1105190:1105191
@@ -351,8 +351,14 @@
       QDomElement e = n.toElement();
       QString tagName = e.tagName();
 
-      if ( tagName == "interval" )
-        mRecurrence.interval = e.text().toInt();
+      if ( tagName == "interval" ) {
+        //kolab/issue4229, sometimes  the interval value can be empty
+        if ( e.text().isEmpty() || e.text().toInt() <= 0 ) {
+          mRecurrence.interval = 1;
+        } else {
+          mRecurrence.interval = e.text().toInt();
+        }
+      }
       else if ( tagName == "day" ) // can be present multiple times
         mRecurrence.days.append( e.text() );
       else if ( tagName == "daynumber" )
[prev in list] [next in list] [prev in thread] [next in thread]