--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Thu Jul 22 16:33:21 2010 +0100
@@ -0,0 +1,23 @@
+syntax: glob
+.make.cache
+Makefile
+Makefile*.mk
+.cproject
+.project
+moc_*.cpp
+qrc_*.cpp
+*.moc
+*.bak
+*.orig
+*_0*.mmp
+*template.pkg
+*.qtplugin
+plugin_commonU.def
+
+phoneapp/phoneui2/*.loc
+phoneapp/phoneui2/*.rss
+phoneapp/phoneui2/*.pkg
+phoneuis/bubblemanager2/*.pkg
+
+syntax: regexp
+^inc/.*

--- a/phone.pro	Tue Jun 15 14:14:38 2010 +0100
+++ b/phone.pro	Thu Jul 22 16:33:21 2010 +0100
@@ -22,7 +22,6 @@
 :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
@@ -32,8 +31,7 @@
 SUBDIRS += phoneapp/phonestringloader
 SUBDIRS += phoneapp/phoneui2
 SUBDIRS += phonesettings/cpphonesettingsplugins
-SUBDIRS += phoneplugins/hsdialerwidgetplugin
+SUBDIRS += phoneplugins/dialerwidgetplugin
 SUBDIRS += phoneplugins/infowidgetplugin
-SUBDIRS += phoneuis/ussdeditor
 }
           
\ No newline at end of file

--- a/phone_plat/dialer_keypad_api/dialer_keypad_api.metaxml	Tue Jun 15 14:14:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<api id="56033367735ce0710ede9aa28d24a5f1" dataversion="1.0">
-<name>Dialer Keypad API</name>
-<description>CVideoDTMFDialer class provides dialer keypad functionalities.
-
-In Video Telephony dialer offers touch keypad for enter as DTMFs 
-and client's CCoeControl is used to show video and keypad. 
-Video DTMF dialer does not implement menu or command buttons, 
-only keypad which presses are forwarded to host application as key events.</description>
-<type>c++</type>
-<subsystem>phoneuis</subsystem>
-<libs><lib name="dialer.lib"/>
-</libs>
-<release category="domain" sinceversion="5.0"/>
-<attributes>
-<htmldocprovided>no</htmldocprovided>
-<adaptation>yes</adaptation>
-</attributes>
-</api>

--- a/phone_plat/dialer_keypad_api/group/bld.inf	Tue Jun 15 14:14:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2006 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:  File that exports the files belonging to 
-:                Dialer keypad API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/cvideodtmfdialer.h     APP_LAYER_PLATFORM_EXPORT_PATH(cvideodtmfdialer.h)

--- a/phone_plat/dialer_keypad_api/inc/cvideodtmfdialer.h	Tue Jun 15 14:14:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CVideoDTMFDialer class provides dialer keypad 
-*                functionalities
-*
-*/
-
-
-
-#ifndef CVIDEODTMFDIALER_H
-#define CVIDEODTMFDIALER_H
-
-//  INCLUDES
-#include <coecntrl.h>
-#include <coemain.h>
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class CDialerKeyPadContainer;
-class CDialerVideoContainer;
-class CEikonEnv;
-
-// CLASS DECLARATION
-
-/**
-*  CVideoDTMFDialer class.
-*
-*  @lib dialer.lib
-*  @since Series60_5.0
-*
-*  Description:
-*
-*   In Video Telephony dialer offers touch keypad for enter as DTMFs 
-*   and client's CCoeControl is used to show video and keypad. 
-*   Video DTMF dialer does not implement menu or command buttons, 
-*   only keypad which presses are forwarded to host application as key events.  
-*
-*   From host application dialer requires:
-*   - View/container as CCoeControl
-*   - App UI HandleCommand, DynInitMenuBar/Pane and CBA handling 
-*   - HandleKeyEventL to handle numbers/characters from touch pane input.
-*
-* 
-*  Usage:
-
-    // Create 'video window'.
-    CCoeControl* videoControl = new( ELeave ) CEikLabel;
-    videoControl->SetBufferReserveLengthL( 10 );
-    videoControl->SetTextL( _L("Video Here") ) ;
-
-    // Create dialer.
-    CVideoDTMFDialer* videoDialer = CVideoDTMFDialer::NewL( *this, *videoControl, aDialerArea );
-    // Delete dialer
-    delete dialer;
-    
-*
-*/
-NONSHARABLE_CLASS(CVideoDTMFDialer) : public CCoeControl
-    {
-    public:  // Constructors and destructor
-    
-        /**
-        * Two phase constructor
-        * @param aContainer Parent container
-        * @param aVideoWindow Control viewing video
-        * @param aRect Area to use for dialer
-        * @return New instance or Dialer
-        */
-        IMPORT_C static CVideoDTMFDialer* NewL( const CCoeControl& aContainer, 
-            CCoeControl& aVideoWindow,
-            const TRect& aRect );
-
-        /**
-        * Destructor.
-        */
-        IMPORT_C virtual ~CVideoDTMFDialer();
-
-    private:  // Functions from CCoeControl
-        
-        /**
-        * @see CCoeControl
-        */
-        void SizeChanged();
-        
-        /**
-        * @see CCoeControl
-        */
-        void PositionChanged();
-
-        /**
-        * @see CCoeControl
-        */
-        TInt CountComponentControls() const;
-        
-        /**
-        * @see CCoeControl
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        
-        /**
-        * @see CCoeControl
-        */
-        void Draw( const TRect& aRect ) const;
-
-        /**
-        * @see CCoeControl
-        */
-        void HandleResourceChange( TInt aType );
-        
-        /**
-        * @see CCoeControl
-        */
-        void HandlePointerEventL( const TPointerEvent& aPointerEvent );
-        
-    private:
-
-        /**
-        * Constructor
-        */
-        CVideoDTMFDialer( );
-
-        /**
-        * 2nd phase constructor.
-        * @param aContainer Parent container
-        * @param aVideoWindow Control containing the video
-        * @param aRect area to use for dialer
-        */
-        void ConstructL( const CCoeControl& aContainer , 
-            CCoeControl& aVideoWindow,
-            const TRect& aRect );
-        
-        /**
-        * Load resource file.
-        */
-        void LoadResourceL();
-        
-        /**
-        * Unload resource file.
-        */
-        void UnLoadResources();
- 
-        /**
-        * @see CCoeControl::ComponentControl()
-        * @param aIndex control index
-        */
-        CCoeControl* ComponentControlForVideoMode( const TInt aIndex ) const;
-        
-    private:    // Data
-           
-        // Keypad container  - owned
-        CDialerKeyPadContainer* iKeypadArea;
-        
-        // Video container - owned
-        CDialerVideoContainer* iVideoWindow;
-        
-        // Parent container
-        const CCoeControl* iParentControl;
-
-        // Reference to CEikonEnv
-        CEikonEnv& iEikEnv;
-        
-        // Resource 
-        TInt iResourceOffset;
-        
-        // For future use.        
-        TBool* iReserved1;
-        TBool* iReserved2;
-    };
-
-#endif      // CVIDEODTMFDIALER_H
-
-// End of File

--- a/phone_plat/group/bld.inf	Tue Jun 15 14:14:38 2010 +0100
+++ b/phone_plat/group/bld.inf	Thu Jul 22 16:33:21 2010 +0100
@@ -25,8 +25,6 @@
 #include "../telephony_video_mailbox_settings_api/group/bld.inf"
 
 //#include "../telephony_configuration_api/group/bld.inf"
-//#include "../dialer_keypad_api/group/bld.inf"
-//#include "../telephony_bubble_extension_api/group/bld.inf"
 
 #include "../telephony_menu_extension_api/group/bld.inf"
 #include "../telephony_microphone_mute_status_api/group/bld.inf"