# HG changeset patch
# User Lars Kurth <larsk@symbian.org>
# Date 1276607678 -3600
# Node ID bab96b7ed1a4522a5158c9790d477ca3bed74eac
# Parent  35db4fa135f4e9529933b451a3687a2cf8f18fa2
Bug 2940 - component missing in phone.pro and malformed use of %d in format string of printf style API

diff -r 35db4fa135f4 -r bab96b7ed1a4 phone.pro
--- a/phone.pro	Fri Jun 11 16:24:06 2010 +0100
+++ b/phone.pro	Tue Jun 15 14:14:38 2010 +0100
@@ -1,39 +1,39 @@
-#
-# 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: Project file for building Phone components
-#
-#
-
-TEMPLATE = subdirs
-CONFIG += ordered
-
-symbian: {
-:BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"group/bld.inf\""
-SUBDIRS += phoneengine/phonecntfinder2
-SUBDIRS += phoneengine/phoneservices
-SUBDIRS += phoneengine/parserrecognizer
-SUBDIRS += phoneengine/phonemodel
-SUBDIRS += phoneengine/networkhandlingstarter
-SUBDIRS += phoneuis/bubblemanager2
-SUBDIRS += phoneplugins/phoneindicatorplugin
-SUBDIRS += phoneapp/phoneuiview2
-SUBDIRS += phoneapp/phoneuiqtviewadapter
-SUBDIRS += phoneapp/phonestringloader
-SUBDIRS += phoneapp/phoneui2
-SUBDIRS += phonesettings/cpphonesettingsplugins
-#SUBDIRS += phoneplugins/hsdialerwidgetplugin
-SUBDIRS += phoneplugins/infowidgetplugin
-SUBDIRS += phoneuis/ussdeditor
-}
+#
+# 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building Phone components
+#
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+symbian: {
+:BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"group/bld.inf\""
+SUBDIRS += phoneengine/phonecntfinder2
+SUBDIRS += phoneengine/phoneservices
+SUBDIRS += phoneengine/parserrecognizer
+SUBDIRS += phoneengine/phonemodel
+SUBDIRS += phoneengine/networkhandlingstarter
+SUBDIRS += phoneuis/bubblemanager2
+SUBDIRS += phoneplugins/phoneindicatorplugin
+SUBDIRS += phoneapp/phoneuiview2
+SUBDIRS += phoneapp/phoneuiqtviewadapter
+SUBDIRS += phoneapp/phonestringloader
+SUBDIRS += phoneapp/phoneui2
+SUBDIRS += phonesettings/cpphonesettingsplugins
+SUBDIRS += phoneplugins/hsdialerwidgetplugin
+SUBDIRS += phoneplugins/infowidgetplugin
+SUBDIRS += phoneuis/ussdeditor
+}
           
\ No newline at end of file
diff -r 35db4fa135f4 -r bab96b7ed1a4 phoneplugins/csplugin/src/cspeteldtmfmonitor.cpp
--- a/phoneplugins/csplugin/src/cspeteldtmfmonitor.cpp	Fri Jun 11 16:24:06 2010 +0100
+++ b/phoneplugins/csplugin/src/cspeteldtmfmonitor.cpp	Tue Jun 15 14:14:38 2010 +0100
@@ -127,7 +127,7 @@
             {
             // Unknown event
             CSPLOGSTRING3( CSPERROR, 
-                "CSPEtelDtmfMonitor::RunL: Unknown event = %¨d, type = %d", 
+                "CSPEtelDtmfMonitor::RunL: Unknown event = %d, type = %d", 
                     iEventData.iEvent, iEventData.iType );
             
             // Refresh and return (no observer notfiying).