--- a/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h	Wed Sep 01 12:15:03 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-2005 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,11 +21,11 @@
 
 // INCLUDES
 #include <etelmm.h>            // ETel
-#include "phcltclientserver.h" 
-#include "mphsrvussdnetworkobserver.h" 
-#include "mphsrvussdreplytimerobserver.h" 
+#include "PhCltClientServer.h"
+#include "MPhSrvUssdNetworkObserver.h"
+#include "MPhSrvUssdReplyTimerObserver.h"
 #include <badesca.h>
-#include <hbdevicemessageboxsymbian.h>
+
 
 // FORWARD DECLARATIONS
 class RFs;
@@ -35,8 +35,11 @@
 class CPhSrvUssdReplyTimer;
 class MPhSrvPhoneInterface;
 class MPhSrvUssdMessageSentObserver;
+class CAknGlobalMsgQuery;
 class CPhSrvUssdSessionCancelWaiter;
 class CPhSrvUssdNotifyNWRelease;
+// RM-RIM 417-66528
+class CUssdExtensionInterface;
 
 // CLASS DECLARATION
 
@@ -48,8 +51,7 @@
 class CPhSrvUssdManager : 
     public CActive, 
     public MPhSrvUssdNetworkObserver, 
-    public MPhSrvUssdReplyTimerObserver,
-    public MHbDeviceMessageBoxObserver
+    public MPhSrvUssdReplyTimerObserver
     {
     public:  // Constructors and destructor
 
@@ -161,12 +163,6 @@
         */
         void UssdReplyTimerObserverHandleExpiredL( TInt aError );
         
-        /**
-        * @see MHbDeviceMessageBoxObserver
-        */        
-        void MessageBoxClosed(const CHbDeviceMessageBoxSymbian* aMessageBox,
-            CHbDeviceMessageBoxSymbian::TButtonId aButton);
-        
         /*
         * @see CActive
         */
@@ -181,6 +177,8 @@
         * @see CActive
         */
         TInt RunError( TInt aError );
+ 
+
 
     private: // New functions
         
@@ -218,6 +216,18 @@
             const TDes8& aMsgData, 
             const RMobileUssdMessaging::TMobileUssdAttributesV1& 
                   aMsgAttributes);
+
+        // RM-RIM 417-66528
+        /** Third stage handler for received messages meant for extension 
+        */
+        void PorcessReceivedMessageInExtesnionL(const TDes8& aMsgData, 
+                const RMobileUssdMessaging::TMobileUssdAttributesV1& 
+                      aMsgAttributes);
+        /** Third stage handler for received messages 
+        */
+        void ProcessReceivedMessageL(const TDes8& aMsgData, 
+                const RMobileUssdMessaging::TMobileUssdAttributesV1& 
+                      aMsgAttributes);
         // Restart the reply timer
         void RestartReplyTimerL();
         
@@ -227,6 +237,11 @@
         // Set timer and activate it if there are notifications available
         void SetActiveIfPendingNotificationsExist();
         
+        // RM-RIM 417-66528
+        // Create and Initialize the global message query
+        void CreateGlobalMessageQueryL( 
+                const RMobileUssdMessaging::TMobileUssdAttributesV1& 
+                      aMsgAttributes);
         // Launch the global message query (used from RunL)
         void LaunchGlobalMessageQueryL();
         
@@ -307,7 +322,7 @@
         * 
         * @since 3.1
         */
-        void UpdateNotifyMessageL();
+        void UpdateNotifyMessage();
         
         /**
         * Turn lights on
@@ -315,15 +330,9 @@
         * @since 3.1
         */
         void TurnLightsOn();
-        
-        /**
-        * Load default string by QT style localization
-        * @param aText default string id defined by _LIT
-        */        
-        const TPtrC LoadDefaultString( const TDesC& aText );
 
     private:     // Data
-        
+
         // The file session reference.
         RFs& iFsSession;
         
@@ -352,8 +361,8 @@
         TBuf< KPhCltUssdMax8BitCharacters > iReceivedMessage;
         
         // The message query for showing USSD operation queries.
-        CHbDeviceMessageBoxSymbian* iDeviceDialog;
-       
+        CAknGlobalMsgQuery* iGlobalMsgQuery;
+        
         // Is editor emptied.
         TBool iEmptyEditor;
         
@@ -384,6 +393,9 @@
         // Local Telephony variant read-only data.
         TInt iVariantReadOnlyValues;
 
+        // The message query header text.
+        HBufC* iMeQuHeaderText;
+
         // The buffer for received decoded message.
         TBuf< KPhCltUssdMax8BitCharacters > iDecodedMessage;
 
@@ -411,7 +423,7 @@
         // Show Done note
         TBool iShowDone;
 
-        // Checks if received message type is Reply
+		// Checks if received message type is Reply
         TBool iMsgTypeReply;
         
         // Has the transaction been closed or not
@@ -426,8 +438,9 @@
         // An asynchronous callback for sending MO ACK messages
         CAsyncCallBack* iMoAckCallback;
         
-        HBufC* iTextBuffer;
-
+        // RM-RIM 417-66528
+        // Pointer to the UssdExtension
+        CUssdExtensionInterface* iUssdExtnInterface;
     };
     
 #endif // CPHSRVUSSDMANAGER_H