--- a/mmsharing/livecommsui/lcui/src/lceffecthandler.cpp	Wed Jun 23 18:09:54 2010 +0300
+++ b/mmsharing/livecommsui/lcui/src/lceffecthandler.cpp	Tue Jul 06 14:13:16 2010 +0300
@@ -181,8 +181,6 @@
     LC_QDEBUG( "livecomms [UI] <- LcEffectHandler::swap()" )
 }
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -194,11 +192,8 @@
          mSwapSharedCompleted = false;
          mSwapReceivedCompleted = false;
      
-         const char* effect = selectSwapEffect( mSharedVideo );
-         startEffect( mSharedVideoOverlay, effect, "windowSwapSharedComplete" );
-
-         effect = selectSwapEffect( mReceivedVideo );
-         startEffect( mReceivedVideoOverlay, effect, "windowSwapReceivedComplete" );
+         startEffect( mSharedVideoOverlay, lcEffectWinDisappearId, "windowSwapSharedComplete" );
+         startEffect( mReceivedVideoOverlay, lcEffectWinDisappearId, "windowSwapReceivedComplete" );
              
          mSharedVideo->hide();
          mReceivedVideo->hide();
@@ -206,40 +201,6 @@
     
 }    
 
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-const char* LcEffectHandler::selectSwapEffect( HbWidget* widget )
-{
-    LC_QDEBUG("livecomms [UI] -> LcEffectHandler::selectSwapEffect()")
-    const char* effect = lcEffectWinDisappearId;
-
-    if ( mSharedVideo && 
-         mReceivedVideo && 
-         HbInstance::instance()->allMainWindows().at(0)->orientation() == Qt::Vertical &&
-         !videosSideBySide() ) {        
-        if( widget == mSharedVideo ) {
-            if ( isSharedVideoAtTop() ) {
-                effect = lcEffectWinSwapDownId;
-            } else {
-                effect = lcEffectWinSwapUpId;
-            }         
-            LC_QDEBUG_2("livecomms [UI] shared video effect:", effect)    
-        } else if( widget == mReceivedVideo ) {
-            if ( isSharedVideoAtTop() ) {
-                effect = lcEffectWinSwapUpId;
-            } else {
-                effect = lcEffectWinSwapDownId;
-            }
-            LC_QDEBUG_2("livecomms [UI] received video effect:", effect)
-        }
-    } 
-    LC_QDEBUG("livecomms [UI] <- LcEffectHandler::selectSwapEffect()")
-    return effect;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -258,7 +219,6 @@
     LC_QDEBUG( "livecomms [UI] <- LcEffectHandler::startEffect()" )
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------