* 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, 4 insertions, 0 deletions

diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index ee07c375b..45bd81fca 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -139,6 +139,9 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFromLName );
   menu->insert( action );
+  action = new KAction( i18n( "Addresses of all original recipients" ),
+                        0, mapper, TQT_SLOT( map() ), menu );
+  mapper->setMapping( action, COAddresseesAddr );
   action = new KAction( i18n( "Subject" ),
                         0, mapper, TQT_SLOT( map() ), menu );
   mapper->setMapping( action, COFullSubject );
@@ -365,6 +368,7 @@ void TemplatesInsertCommand::slotMapped( int cmd )
   case TemplatesInsertCommand::CTime: emit insertCommand("%TIME"); break;
   case TemplatesInsertCommand::CTimeLong: emit insertCommand("%TIMELONG"); break;
   case TemplatesInsertCommand::CTimeLongEn: emit insertCommand("%TIMELONGEN"); break;
+  case TemplatesInsertCommand::COAddresseesAddr: emit insertCommand("%OADDRESSEESADDR"); break;
   case TemplatesInsertCommand::CToAddr: emit insertCommand("%TOADDR"); break;
   case TemplatesInsertCommand::CToName: emit insertCommand("%TONAME"); break;
   case TemplatesInsertCommand::CToFName: emit insertCommand("%TOFNAME"); break;