--- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp	Mon May 03 13:01:45 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcallbarringwrapper_p.cpp	Fri May 14 16:24:46 2010 +0300
@@ -202,12 +202,11 @@
     
     TServiceGroup convertedServiceGroup = convertServiceGroup(serviceGroup);
     TBarringProgram convertedBarringType = convertBarringType(barringType);
-    
+
+    m_currentRequest = RequestBarringStatus;
     QT_TRAP_THROWING(m_callBarring->GetBarringStatusL(
         convertedServiceGroup, convertedBarringType)
     )
-    
-    m_currentRequest = RequestBarringStatus;
 }
 
 
@@ -228,11 +227,11 @@
     setting.iPassword.Copy(barringPassword.utf16());
     
     TBasicServiceGroups serviceGroups = EAllTeleAndBearer;
+    
+    m_currentRequest = RequestEnableBarring;
     QT_TRAP_THROWING(
         m_callBarring->SetBarringL(setting, serviceGroups);
     )
-    
-    m_currentRequest = RequestEnableBarring;
 }
 
 
@@ -253,11 +252,11 @@
     setting.iPassword.Copy(barringPassword.utf16());
     
     TBasicServiceGroups serviceGroups = EAllTeleAndBearer;
+
+    m_currentRequest = RequestDisableBarring;
     QT_TRAP_THROWING(
         m_callBarring->SetBarringL(setting, serviceGroups);
-    )
-    
-    m_currentRequest = RequestDisableBarring;
+    )    
 }
 
 
@@ -274,11 +273,10 @@
     passwordChange.iNewPassword.Copy(newPassword.utf16());
     passwordChange.iVerifiedPassword.Copy(verifiedPassword.utf16());
     
+    m_currentRequest = RequestChangePassword;
     QT_TRAP_THROWING(
         m_callBarring->ChangePasswordL(passwordChange);
     )
-    
-    m_currentRequest = RequestChangePassword;
 }