From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/managesievescriptsdialog.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kmail/managesievescriptsdialog.h') diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h index 2195e911e..70c4f6978 100644 --- a/kmail/managesievescriptsdialog.h +++ b/kmail/managesievescriptsdialog.h @@ -28,6 +28,7 @@ private slots: void slotSelectionChanged( TQListViewItem * ); void slotNewScript(); void slotEditScript(); + void slotDeactivateScript(); void slotDeleteScript(); void slotGetResult( KMail::SieveJob *, bool, const TQString &, bool ); void slotPutResult( KMail::SieveJob *, bool ); @@ -36,7 +37,7 @@ private slots: private: void killAllJobs(); - void changeActiveScript( TQCheckListItem * ); + void changeActiveScript( TQCheckListItem *, bool activate = true ); private: TQListView * mListView; -- cgit v1.2.1