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

List:       kde-commits
Subject:    branches/KDE/4.2/kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2009-06-08 12:46:07
Message-ID: 1244465167.083327.4283.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 978881 by djarvie:

Bug 195599: Fix email alarms sending multiple mails, when sent by KMail


 M  +3 -0      Changelog  
 M  +1 -1      kalarm.h  
 M  +2 -2      kalarmapp.cpp  


--- branches/KDE/4.2/kdepim/kalarm/Changelog #978880:978881
@@ -1,5 +1,8 @@
 KAlarm Change Log
 
+=== Version 2.1.9 --- 8 June 2009 ===
+- Fix email alarms sending multiple mails, when sent via KMail.
+
 === Version 2.1.8 --- 25 May 2009 ===
 - Fix crash on exit from birthday import dialogue.
 - Fix crash when an alarm is open for edit when its last occurrence triggers,
--- branches/KDE/4.2/kdepim/kalarm/kalarm.h #978880:978881
@@ -23,7 +23,7 @@
 
 #undef QT3_SUPPORT
 
-#define KALARM_VERSION "2.1.8"
+#define KALARM_VERSION "2.1.9"
 #define KALARM_NAME "KAlarm"
 #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
 
--- branches/KDE/4.2/kdepim/kalarm/kalarmapp.cpp #978880:978881
@@ -1716,6 +1716,8 @@
 			{
 				result = (void*)-1;   // email has been queued
 			}
+			if (reschedule)
+				rescheduleAlarm(event, alarm, true);
 			break;
 		}
 		default:
@@ -1740,8 +1742,6 @@
 	}
 	else if (data.queued)
 		emit execAlarmSuccess();
-	if (data.reschedule)
-		rescheduleAlarm(data.event, data.alarm, true);
 }
 
 /******************************************************************************
[prev in list] [next in list] [prev in thread] [next in thread]