# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1284741189 -3600
# Node ID 0258d9fa8eacacec9a436fffd01c9fe72eeac50b
# Parent  8baf28733c3df543742d55765dda2421a7161ae7# Parent  b0a26d6936b254e56b6c71a1db34281d4d1fbea2
Merge Bug 3596 and Bug 2832

diff -r 8baf28733c3d -r 0258d9fa8eac phoneapp/silenceactionplugin/group/bld.inf
--- a/phoneapp/silenceactionplugin/group/bld.inf	Tue Sep 14 21:18:17 2010 +0300
+++ b/phoneapp/silenceactionplugin/group/bld.inf	Fri Sep 17 17:33:09 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 8baf28733c3d -r 0258d9fa8eac phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Tue Sep 14 21:18:17 2010 +0300
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri Sep 17 17:33:09 2010 +0100
@@ -2459,8 +2459,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;
     }
 
 // -----------------------------------------------------------------------------