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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2006-06-09 21:57:42
Message-ID: 1149890262.261561.13271.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 549799 by djarvie:

Fix crash when a deferred expired recurring alarm is edited from message window Edit \
button


 M  +2 -1      Changelog  
 M  +9 -1      alarmevent.cpp  
 M  +3 -1      recurrenceedit.cpp  


--- branches/KDE/3.5/kdepim/kalarm/Changelog #549798:549799
@@ -1,7 +1,8 @@
 KAlarm
 
-=== Version 1.3.11 --- 31 May 2006 ===
+=== Version 1.3.11 --- 9 June 2006 ===
 Fix Defer dialog time interval maximum to match maximum date/time value.
+Fix crash when a deferred expired recurring alarm is edited from message window.
 
 === Version 1.3.10 (KDE 3.5.3) --- 22 May 2006 ===
 Add DCOP calls and command line options to display the edit alarm dialogue.
--- branches/KDE/3.5/kdepim/kalarm/alarmevent.cpp #549798:549799
@@ -1,7 +1,7 @@
 /*
  *  alarmevent.cpp  -  represents calendar alarms and events
  *  Program:  kalarm
- *  Copyright (c) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright (c) 2001-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -2138,6 +2138,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date/time (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurMinutely(int freq, int count, const QDateTime& end)
 {
@@ -2153,6 +2154,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurDaily(int freq, const QBitArray& days, int count, const QDate& \
end)  {
@@ -2178,6 +2180,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurWeekly(int freq, const QBitArray& days, int count, const \
QDate& end)  {
@@ -2196,6 +2199,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurMonthlyByDate(int freq, const QValueList<int>& days, int \
count, const QDate& end)  {
@@ -2216,6 +2220,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurMonthlyByPos(int freq, const QValueList<MonthPos>& posns, int \
count, const QDate& end)  {
@@ -2238,6 +2243,7 @@
  *           = -1 to recur indefinitely.
  *           = 0 to use 'end' instead.
  *    end    = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurAnnualByDate(int freq, const QValueList<int>& months, int day, \
KARecurrence::Feb29Type feb29, int count, const QDate& end)  {
@@ -2261,6 +2267,7 @@
  *           = -1 to recur indefinitely.
  *           = 0 to use 'end' instead.
  *    end    = end date (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecurAnnualByPos(int freq, const QValueList<MonthPos>& posns, const \
QValueList<int>& months, int count, const QDate& end)  {
@@ -2281,6 +2288,7 @@
  *          = -1 to recur indefinitely.
  *          = 0 to use 'end' instead.
  *    end   = end date/time (invalid to use 'count' instead).
+ * Reply = false if no recurrence was set up.
  */
 bool KAEvent::setRecur(RecurrenceRule::PeriodType recurType, int freq, int count, \
const QDateTime& end, KARecurrence::Feb29Type feb29)  {
--- branches/KDE/3.5/kdepim/kalarm/recurrenceedit.cpp #549798:549799
@@ -1,7 +1,7 @@
 /*
  *  recurrenceedit.cpp  -  widget to edit the event's recurrence definition
  *  Program:  kalarm
- *  Copyright (c) 2002 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright (c) 2002-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  Based originally on KOrganizer module koeditorrecurrence.cpp,
  *  Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
@@ -894,6 +894,8 @@
 		event.setNoRecur();
 		return;
 	}
+	if (!event.recurs())
+		return;    // an error occurred setting up the recurrence
 	if (adjustStart)
 		event.setFirstRecurrence();
 


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