[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-11-30 20:02:49
Message-ID: 1164916969.230494.20654.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 609440 by djarvie:

Clearer error message when alarm deletion fails

 M  +5 -1      functions.cpp  
 M  +1 -1      functions.h  


--- branches/KDE/3.5/kdepim/kalarm/functions.cpp #609439:609440
@@ -374,7 +374,7 @@
 			status = SAVE_FAILED;
 	}
 	if (status > UPDATE_KORG_ERR  &&  errmsgParent)
-		displayUpdateError(errmsgParent, SAVE_FAILED, ERR_ADD, 1);
+		displayUpdateError(errmsgParent, SAVE_FAILED, ERR_DELETE, 1);
 	return status;
 }
 
@@ -505,6 +505,10 @@
 			errmsg = (nAlarms > 1) ? i18n("Error saving alarms")
 			                       : i18n("Error saving alarm");
 			break;
+		case ERR_DELETE:
+			errmsg = (nAlarms > 1) ? i18n("Error deleting alarms")
+			                       : i18n("Error deleting alarm");
+			break;
 		case ERR_REACTIVATE:
 			errmsg = (nAlarms > 1) ? i18n("Error saving reactivated alarms")
 			                       : i18n("Error saving reactivated alarm");
--- branches/KDE/3.5/kdepim/kalarm/functions.h #609439:609440
@@ -56,7 +56,7 @@
 	SAVE_FAILED         // calendar was updated in memory, but save failed
 };
 /** Error codes supplied as parameter to displayUpdateError() */
-enum UpdateError { ERR_ADD, ERR_REACTIVATE, ERR_TEMPLATE };
+enum UpdateError { ERR_ADD, ERR_DELETE, ERR_REACTIVATE, ERR_TEMPLATE };
 /** Error codes supplied as parameter to displayKOrgUpdateError() */
 enum KOrgUpdateError { KORG_ERR_ADD, KORG_ERR_MODIFY, KORG_ERR_DELETE };
 
[prev in list] [next in list] [prev in thread] [next in thread]