diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamcallheaderdata.h	Wed Sep 01 12:30:10 2010 +0100
@@ -23,9 +23,9 @@
 //  INCLUDES
 
 #include <w32std.h>
-#include <cntdef.h>
 #include "tphonecommandparam.h"
 #include "phoneconstants.h"
+#include "bmbubblemanager.h"
 
 // DATA TYPES
 
@@ -44,12 +44,6 @@
             EPhoneParticipantCLIText,
             EPhoneParticipantCNAPText,                
             };
-
-        enum TPhoneTextClippingDirection
-            {
-            ERight,
-            ELeft
-            };
            
     public:  
         
@@ -58,10 +52,6 @@
         */
         IMPORT_C TPhoneCmdParamCallHeaderData();
 
-        /**
-        * destructor.
-        */
-        IMPORT_C ~TPhoneCmdParamCallHeaderData();
     public: 
         
         /**
@@ -106,7 +96,7 @@
         * @param aDirection Clipping direction of the CLI text.
         */
         IMPORT_C void SetCLIText( const TDesC& aCLIText, 
-                                  TPhoneTextClippingDirection aDirection );
+                                  CBubbleManager::TPhoneClippingDirection aDirection );
 
         /**
         * Sets the call header CNAP text
@@ -114,19 +104,20 @@
         * @param aDirection Clipping direction of the CNAP text.
         */
         IMPORT_C void SetCNAPText( const TDesC& aCNAPText,
-                                   TPhoneTextClippingDirection aDirection );
+                CBubbleManager::TPhoneClippingDirection aDirection );
 
         /**
         * Sets the call header picture
         * @param aPicture is the picture data
         */
         IMPORT_C void SetPicture( const TDesC& aPicture );
-
+        
         /**
-        * Sets the call header diverted status.
+        * Sets the call flag
         * @param call flag
         */
-        IMPORT_C void SetDiverted( TBool aDiverted );
+        IMPORT_C void SetCallFlag( 
+            CBubbleManager::TPhoneCallTypeFlags aCallFlag );
             
         /**
         * Sets the call header line2 status.
@@ -135,6 +126,13 @@
         IMPORT_C void SetLine2( TBool aLine2 );
             
         /**
+        * Adds the call flag
+        * @param call flag
+        */
+        IMPORT_C void AddCallFlag( 
+            CBubbleManager::TPhoneCallTypeFlags aCallFlag );
+
+        /**
         * Returns the call header label text
         * @return Returns the label
         */
@@ -180,13 +178,13 @@
          * Returns the clipping direction of the CLI text.
          * @return  Clipping direction of the CLI text.
          */
-        IMPORT_C TPhoneTextClippingDirection CLITextClippingDirection() const;
+        IMPORT_C CBubbleManager::TPhoneClippingDirection CLITextClippingDirection() const;
 
         /**
          * Returns the clipping direction of the CNAP text.
          * @return  Clipping direction of the CNAP text.
          */
-        IMPORT_C TPhoneTextClippingDirection CNAPTextClippingDirection() const;
+        IMPORT_C CBubbleManager::TPhoneClippingDirection CNAPTextClippingDirection() const;
         
         /**
         * Returns the call header CNAP text.
@@ -201,10 +199,10 @@
         IMPORT_C const TDesC& Picture() const;
         
         /**
-        * Returns call diverted status.
-        * @return Returns ETrue if diverted call.
+        * Returns the call flag
+        * @return Returns the call flag
         */
-        IMPORT_C TBool Diverted() const;
+        IMPORT_C TUint32 CallFlag() const;
         
         /**
         * Returns the call header line 2 active.
@@ -315,12 +313,12 @@
         /**
         * Call header label text
         */
-        HBufC *iLabelText;
+        TBuf<KPhoneCallHeaderLabelMaxLength> iLabelText;
 
         /**
         * Call header short label text
         */
-        HBufC *iShortLabelText;
+    	TBuf<KPhoneCallHeaderLabelMaxLength> iShortLabelText;
 
         /**
         * Call header call state
@@ -345,29 +343,33 @@
         /**
         * Call header CLI Text
         */
-        HBufC *iCLIText;
+        TBuf<KCntMaxTextFieldLength> iCLIText;
 
         /**
          * Clipping direction of the CLI text.
          */
-        TPhoneTextClippingDirection iCLITextClippingDirection;
-       
+        CBubbleManager::TPhoneClippingDirection iCLITextClippingDirection;
+        
         /**
          * Clipping direction of the CLI text.
          */
-//        CBubbleManager::TPhoneClippingDirection iCNAPTextClippingDirection;
-        TPhoneTextClippingDirection iCNAPTextClippingDirection;
+        CBubbleManager::TPhoneClippingDirection iCNAPTextClippingDirection;
         
         /**
         * Call header CNAP Text
         */
-        HBufC *iCNAPText;
+        TBuf<KCntMaxTextFieldLength> iCNAPText;
 
         /**
         * Call header picture data
         */
         TPtrC iPicture;
         
+        /**
+        * Call flag
+        */
+        TUint32     iCallFlag;
+        
         TBool iLine2;
         
         /**
@@ -411,11 +413,6 @@
          * Remote phone number
          */
         TPtrC iRemotePhoneNumber;
-
-        /**
-         * Call divert status.
-         */
-        TBool iDiverted;        
     };
 
 #endif // __TPHONECMDPARAMCALLHEADERDATA_H