--- a/meetingrequest/mrviewercalplugin/src/cesmrviewersimpl.cpp Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrviewercalplugin/src/cesmrviewersimpl.cpp Wed Mar 31 21:08:33 2010 +0300
@@ -29,7 +29,7 @@
// From MR Mailbox Utils
#include <cmrmailboxutils.h>
-#include <CMRUtils.h>
+#include <cmrutils.h>
// From System
#include <coemain.h>
@@ -100,30 +100,11 @@
MAgnEntryUiCallback& aCallback)
{
FUNC_LOG;
- TRAPD( err, ExecuteViewInternalL(
+ return ExecuteViewInternalL(
aEntries,
aInParams,
aOutParams,
- aCallback ) );
-
- if ( KErrArgument == err )
- {
- // ES MR VIEWER controller was unable to show the
- // passed meeting request. Let's launc normal meeting viewer
- // for showing the entry
-
- CCalenEditorsPlugin* editorsPlugin = CCalenEditorsPlugin::NewL();
- CleanupStack::PushL( editorsPlugin );
-
- err = editorsPlugin->ExecuteViewL( aEntries,
- aInParams,
- aOutParams,
- aCallback );
-
- CleanupStack::PopAndDestroy( editorsPlugin );
- }
-
- return err;
+ aCallback );
}
// ----------------------------------------------------------------------------