* 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

1 files changed, 2 insertions, 0 deletions

diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 20bb55a70..f8e71073c 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -40,6 +40,7 @@ class TQCheckBox;
 class TQComboBox;
 class TQString;
 class TQStringList;
+class SimpleStringListEditor;
 class TemplatesConfiguration;
 class KPushButton;
 namespace Kleo {
@@ -87,6 +88,7 @@ namespace KMail {
     TQLineEdit                    *mNameEdit;
     TQLineEdit                    *mOrganizationEdit;
     TQLineEdit                    *mEmailEdit;
+    SimpleStringListEditor       *mAliasEdit;
     // "cryptography" tab:
     TQWidget                      *mCryptographyTab;
     Kleo::SigningKeyRequester    *mPGPSigningKeyRequester;