phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp
changeset 74 d1c62c765e48
parent 65 2a5d4ab426d3
child 76 cfea66083b62
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp	Fri Sep 03 13:33:36 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp	Fri Sep 17 17:09:12 2010 +0300
@@ -187,11 +187,7 @@
     // No menu items if an emergency call ongoing.
     if (false == isEmergencyCall) {
         switch(callStates.values().count()) {
-        case 1: {
-            // No logical string for switch to video option	
-            /*if (callStates.values().contains(EPEStateConnected)) {
-                commands.append(PhoneInCallCmdSwitchToVideo);
-            }*/
+        case 1: {            
         }
         break;
         case 2: {
@@ -211,7 +207,15 @@
         }
         break;
         case 3: {
-            commands.append(PhoneInCallCmdEndAllCalls);    
+            commands.append(PhoneInCallCmdEndAllCalls);
+            
+            if (callStates.values().contains(EPEStateConnected) &&
+                callStates.values().contains(EPEStateHeld) &&
+                callStates.values().contains(EPEStateRinging)) {
+                if (sameServices) {
+                    commands.append(PhoneInCallCmdTransfer);
+                }
+            }
         }
         break;
         default:
@@ -253,10 +257,7 @@
         break;     
     case PhoneInCallCmdTransfer:
         ret = EPhoneInCallCmdTransfer;
-        break;    
-    case PhoneInCallCmdSwitchToVideo:
-        ret = EPhoneInCallCmdSwitchToVideo;
-        break;  
+        break;
     case PhoneInCallCmdHandoverToWlan:
         ret = EPhoneCmdHandoverToWlan;
         break;