--- a/phoneengine/phoneservices/src/dialservice.cpp	Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneengine/phoneservices/src/dialservice.cpp	Fri Jul 09 15:40:55 2010 +0300
@@ -1,5 +1,5 @@
 /*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,16 +21,16 @@
 #include <featmgr.h>
 #include <settingsinternalcrkeys.h>
 #include <xqsettingsmanager.h>
+#include <e32capability.h>
 #include "dialservice.h"
 #include "qtphonelog.h"
 
 // CONSTANTS
-const int MaxPrefixStringLength = 10;
-const XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidNetworkSettings.iUid, KSettingsDialPrefixChangeMode);
-const XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidNetworkSettings.iUid, KSettingsDialPrefixText);
+const XQSettingsKey dialPrefixMode(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixChangeMode);
+const XQSettingsKey dialPrefixString(XQSettingsKey::TargetCentralRepository, KCRUidTelephonySettings.iUid, KSettingsDialPrefixText);
 
-DialService::DialService(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) : 
-    XQServiceProvider(QLatin1String("com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters), m_settingsManager(0)
+DialService::DialService(MPECallControlIF &call, MPECallSettersIF &parameters, QObject* parent) :
+    XQServiceProvider(QLatin1String("phoneui.com.nokia.symbian.ICallDial"), parent), m_call (call), m_parameters (parameters), m_settingsManager(0)
 {
     publishAll();
     m_settingsManager = new XQSettingsManager(this);
@@ -44,6 +44,9 @@
 int DialService::dial(const QString& number)
 {
     PHONE_DEBUG2("DialService::dial number:", number);
+    if (!hasCapability()) {
+        return KErrPermissionDenied;
+    }
     QString phoneNumber = modifyPhoneNumber(number);
     TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
     m_parameters.SetPhoneNumber (numberPtr);
@@ -54,80 +57,102 @@
 int DialService::dial(const QString& number, int contactId)
 {
     PHONE_DEBUG4("DialService::dial number:", number, "contactId:", contactId);
+	if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     QString phoneNumber = modifyPhoneNumber(number);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeCSVoice);
     m_parameters.SetContactId2 (contactId);
-    return m_call.HandleDialServiceCall (); 
+    return m_call.HandleDialServiceCall ();
 }
 
-void DialService::dialVideo(const QString& number)
+int DialService::dialVideo(const QString& number)
 {
     PHONE_DEBUG2("DialService::dialVideo number:", number);
+	if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     QString phoneNumber = modifyPhoneNumber(number);
     TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeVideo);
-    m_call.HandleDialServiceCall ();
+    return m_call.HandleDialServiceCall ();
 }
 
-void DialService::dialVideo(const QString& number, int contactId)
+int DialService::dialVideo(const QString& number, int contactId)
 {
     PHONE_DEBUG4("DialService::dialVideo number:", number, "contactId:", contactId);
+    if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     QString phoneNumber = modifyPhoneNumber(number);
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(phoneNumber.utf16()));
     m_parameters.SetPhoneNumber (numberPtr);
     m_parameters.SetCallTypeCommand (EPECallTypeVideo);
     m_parameters.SetContactId2 (contactId);
-    m_call.HandleDialServiceCall ();    
+    return m_call.HandleDialServiceCall ();
 }
 
-void DialService::dialVoip(const QString& address)
+int DialService::dialVoip(const QString& address)
 {
     PHONE_DEBUG2("DialService::dialVoip number:", address);
+    if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     TPtrC16 numberPtr(reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
-    m_call.HandleDialServiceCall();    
+    return m_call.HandleDialServiceCall();
 }
 
-void DialService::dialVoip(const QString& address, int contactId)
+int DialService::dialVoip(const QString& address, int contactId)
 {
     PHONE_DEBUG4("DialService::dialVoip number:", address, "contactId:", contactId);
+    if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
     m_parameters.SetContactId2(contactId);
-    m_call.HandleDialServiceCall();    
+    return m_call.HandleDialServiceCall();
 }
 
-void DialService::dialVoipService(const QString& address, int serviceId)
+int DialService::dialVoipService(const QString& address, int serviceId)
 {
     PHONE_DEBUG4("DialService::dialVoipService number:", address, "serviceId:", serviceId);
+    if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
     m_parameters.SetServiceIdCommand(serviceId);
-    m_call.HandleDialServiceCall();    
+    return m_call.HandleDialServiceCall();
 }
 
-void DialService::dialVoipService(
+int DialService::dialVoipService(
         const QString& address, int serviceId, int contactId)
 {
     PHONE_DEBUG2("DialService::dialVoipService number:", address);
     PHONE_DEBUG2("DialService::dialVoipService serviceId:", serviceId);
     PHONE_DEBUG2("DialService::dialVoipService contactId:", contactId);
+    if (!hasCapability()) {
+		return KErrPermissionDenied;
+    }
     TPtrC16 numberPtr (reinterpret_cast<const TUint16*>(address.utf16 ()));
     m_parameters.SetPhoneNumber(numberPtr);
     m_parameters.SetCallTypeCommand(EPECallTypeVoIP);
     m_parameters.SetServiceIdCommand(serviceId);
     m_parameters.SetContactId2(contactId);
-    m_call.HandleDialServiceCall();    
+    return m_call.HandleDialServiceCall();
 }
 
 QString DialService::modifyPhoneNumber(const QString &number)
 {
+    PHONE_DEBUG2("DialService::modifyPhoneNumber number:", number);
     QString modifiedNumber = simplified(number);
     modifiedNumber = japanPrefixModifications(modifiedNumber);
 
@@ -143,26 +168,48 @@
 }
 
 QString DialService::japanPrefixModifications(const QString &number)
-{    
+{
+    PHONE_DEBUG2("DialService::japanPrefixModifications number:", number);
     bool checkPrefix = FeatureManager::FeatureSupported(KFeatureIdJapanPrefixChange);
     if(checkPrefix == false) {
     	  // prefix change setting is off so don't play with the number
         return number;
     }
-    
+
     QString modifiedNumber = number;
-    
+
     int prefixMode = m_settingsManager->readItemValue(dialPrefixMode, XQSettingsManager::TypeInt).toInt();
+    PHONE_DEBUG2("DialService::japanPrefixModifications prefixMode:", prefixMode);
+
     if((m_settingsManager->error() == XQSettingsManager::NoError) && (prefixMode > 0)) {
         // No error fetching value and setting is on
         QString prefixString = m_settingsManager->readItemValue(dialPrefixString, XQSettingsManager::TypeString).toString();
+        PHONE_DEBUG2("DialService::japanPrefixModifications prefixString:", prefixString);
 
         if(m_settingsManager->error() == XQSettingsManager::NoError) {
             if(modifiedNumber.startsWith("+")) {
-                modifiedNumber = modifiedNumber.replace(0, prefixString.length(), prefixString);
-            }        	
+                modifiedNumber = modifiedNumber.remove(0, 1);
+                modifiedNumber = modifiedNumber.insert(0, prefixString);
+            }
         }
     }
-                	
+
+    PHONE_DEBUG2("DialService::japanPrefixModifications modifiedNumber:", modifiedNumber);
     return modifiedNumber;
 }
+
+bool DialService::hasCapability()
+{
+    XQRequestInfo req = requestInfo();
+    QSet<int> caps = req.clientCapabilities();
+
+    if (!caps.contains(ECapabilityNetworkServices)) {
+        PHONE_TRACE1("NetworkServices capability missing");
+        return false;
+    }
+    if (!caps.contains(ECapabilityNetworkControl)) {
+        PHONE_TRACE1("NetworkControl capability missing");
+        return false;
+    }
+	return true;
+}