# HG changeset patch
# User Fionntina Carville <fionntinac@symbian.org>
# Date 1287755895 -3600
# Node ID b49b5af297a79fd90a235ecb112b48719164a06d
# Parent  c26cc2a7c548ae8551eeae5e1316c47ec4526dee# Parent  0258d9fa8eacacec9a436fffd01c9fe72eeac50b
Merge Bug 3596 and Bug 2832

diff -r c26cc2a7c548 -r b49b5af297a7 phoneapp/silenceactionplugin/group/bld.inf
--- a/phoneapp/silenceactionplugin/group/bld.inf	Wed Oct 13 14:31:22 2010 +0300
+++ b/phoneapp/silenceactionplugin/group/bld.inf	Fri Oct 22 14:58:15 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 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"
@@ -24,16 +24,10 @@
 
 PRJ_EXPORTS
 ../data/silenceringingtone_activate.rul\
-	/epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/silenceringingtone_activate.rul
-
-../data/silenceringingtone_activate.rul\
-	/epoc32/data/Z/private/10282BC4/Rules/silenceringingtone_activate.rul
+	z:/private/10282BC4/Rules/silenceringingtone_activate.rul
 
 ../data/silenceringingtone_silence.rul\
-	/epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/silenceringingtone_silence.rul
-
-../data/silenceringingtone_silence.rul\
-	/epoc32/data/Z/private/10282BC4/Rules/silenceringingtone_silence.rul
+	z:/private/10282BC4/Rules/silenceringingtone_silence.rul
 
 ../data/silenceactionplugin_stub.SIS\
     /epoc32/data/z/system/install/silenceactionplugin_stub.SIS
diff -r c26cc2a7c548 -r b49b5af297a7 phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Wed Oct 13 14:31:22 2010 +0300
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri Oct 22 14:58:15 2010 +0100
@@ -2449,8 +2449,10 @@
         {
         iModel.SendMessage( MEngineMonitor::EPEMessageInValidEmergencyNumber );
         }
-
-    return errorCode;
+    // CPhCltEmergencyCall::IsEmergencyPhoneNumber can legitamately return an error code
+    // This simply means that the number is NOT an emergency number (eg it can return KErrArgument)
+    // Therefore we are ignoring any KErrArgument errors that come from this
+    return (errorCode == KErrArgument) ? ECCPErrorNone : errorCode;
     }
 
 // -----------------------------------------------------------------------------