--- a/meetingrequest/mrgui/mrfieldbuilderplugin/src/cmrattachmentsfield.cpp Wed Mar 31 21:08:33 2010 +0300
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/src/cmrattachmentsfield.cpp Wed Apr 14 15:42:15 2010 +0300
@@ -491,10 +491,6 @@
else if ( aCommand == EESMREditorAddAttachment )
{
handled = AddAttachmentL();
- if( handled )
- {
- HandleTactileFeedbackL();
- }
}
else if ( IsValidAttachmentEditorCommand(aCommand) &&
@@ -851,11 +847,9 @@
{
if( Rect().Contains( aPosition ) )
{
+ HandleTactileFeedbackL();
+
ret = AddAttachmentL();
- if( ret )
- {
- HandleTactileFeedbackL();
- }
}
}
// Otherwise only the title and the fieldIcon will
@@ -865,11 +859,9 @@
if( iTitle->Rect().Contains( aPosition ) ||
iFieldIcon->Rect().Contains( aPosition ) )
{
- ret = AddAttachmentL();
- if( ret )
- {
- HandleTactileFeedbackL();
- }
+ HandleTactileFeedbackL();
+
+ ret = AddAttachmentL();
}
}
@@ -888,29 +880,20 @@
{
if( Rect().Contains( aPosition ) )
{
- if( AddAttachmentL() )
- {
- HandleTactileFeedbackL();
- }
+ AddAttachmentL();
}
}
else
{
if ( iRichTextViewer->Rect().Contains( aPosition ) )
{
- if( iRichTextViewer->LinkSelectedL() )
- {
- HandleTactileFeedbackL();
- }
+ iRichTextViewer->LinkSelectedL();
}
if( iTitle->Rect().Contains( aPosition ) ||
iFieldIcon->Rect().Contains( aPosition ) )
{
- if( AddAttachmentL() )
- {
- HandleTactileFeedbackL();
- }
+ AddAttachmentL();
}
}
}