--- a/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -109,7 +109,7 @@
     const CAiwGenericParamList& aInParamList,
     CAiwGenericParamList& /*aOutParamList*/,
     TUint aCmdOptions,
-    const MAiwNotifyCallback* aCallback )
+    const MAiwNotifyCallback* /*aCallback*/ )
     {
     
     // Cancel bit must always be checked. Support can be implemented if necessary.
@@ -132,23 +132,7 @@
             
         if ( index >= 0 && genericParam )
             {
-            TInt err = SetCallImagePathL( genericParam );
-            if ( aCallback )
-                {
-                TInt eventId = err ? KAiwEventError : KAiwEventCompleted;
-                // Must cast this because of AIW bug
-                MAiwNotifyCallback* nonConstCallback =
-                        const_cast<MAiwNotifyCallback*> ( aCallback );
-                CAiwGenericParamList* eventParamList = CAiwGenericParamList::NewL();
-                CleanupStack::PushL( eventParamList );
-                nonConstCallback->HandleNotifyL( 
-                        aCmdId,
-                        eventId,
-                        *eventParamList,
-                        aInParamList );
-                CleanupStack::PopAndDestroy( eventParamList );
-                }
-            User::LeaveIfError( err );
+             User::LeaveIfError( SetCallImagePathL( genericParam ) );
             }
         }
     }