--- a/src/ui/bmi/mmiBookServices.c	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiBookServices.c	Sun Nov 08 06:39:16 2020 +0000
@@ -28,17 +28,17 @@
 ********************************************************************************
  $History: MmiBookServices.c
 
-       Sep 20, 2006 REF: OMAPS00145786  x0080701 (Bharat)  
-	Bug:PhoneBook: Wrong confirmation message in Phonebook storage when copying/moving a contact 
+       Sep 20, 2006 REF: OMAPS00145786  x0080701 (Bharat)
+	Bug:PhoneBook: Wrong confirmation message in Phonebook storage when copying/moving a contact
 	                         after adding one or making a change
  	Fix: ACI shall not send rAT_OK for entry addition / entry change operations in Internal PHB
  	      Hence, the "addname_flag" and "changename_flag" are immdtly reset incase of Internal PHB
- 	
+
     June 22, 2006    REF: DRT OMAPS00081761  x0012849 : Jagannatha
-    Description:Handset crash when adding new entry with more then 20 digits to phonebook SIM card 
+    Description:Handset crash when adding new entry with more then 20 digits to phonebook SIM card
     Solution: Number editor will be restricted to 20 characters when EXT1 is not supported.
 
-       June 14, 2006 REF: OMAPS00079308  x0039928  
+       June 14, 2006 REF: OMAPS00079308  x0039928
 	Bug:Validation and Optimization of Memory consumption
  	Fix: Memory optimization is done in bookFindNameInSpecificPhonebook to save around 450 bytes of memory.
 
@@ -47,21 +47,21 @@
     Solution: In bookInputStartNameEditor, limit the number of characters after
     checking if SIM or ME phonebook is being used.
 
-	Jan 22, 2006 REF: OMAPS00061930  x0039928  
+	Jan 22, 2006 REF: OMAPS00061930  x0039928
 	Bug:PhoneBook -Change entry and view entry through Change option-failed
  	Fix: Phonebook is populated with phone numbers after some time and not immediately while saving the changed entries.
 
      	June 07,  2005   REF: CRR MMI-FIX-31545 x0021334
     	Issue description: SIM: wrong behavior when FDN is not allocated in SST
-   	Solution: Before displaying the FDN options, a check is made if FDN is allocated. Only if 
+   	Solution: Before displaying the FDN options, a check is made if FDN is allocated. Only if
                   	FDN is allocated, the options are displayed.
 
-  	Sep 29, 2004        REF: CRR 25041  xvilliva  
+  	Sep 29, 2004        REF: CRR 25041  xvilliva
 	Bug:		add new entry in the FDN , phone gets rebooted.
-	Fix:		The bookMenuStart() is called with the window data->phbk->win, 
-			similar to the function bookFDNMenu() to avoid crash. The menu 
-			window thus created is stored, which will be deleted while 
-			phonebook menu is destroyed. 
+	Fix:		The bookMenuStart() is called with the window data->phbk->win,
+			similar to the function bookFDNMenu() to avoid crash. The menu
+			window thus created is stored, which will be deleted while
+			phonebook menu is destroyed.
 
 	Jul 29, 2004        REF: CRR 20888  Deepa M.D
 	Bug:Message received not showing with name, name stored in phonebook
@@ -69,19 +69,19 @@
 
  	Jul 28, 2004       	REF: CRR:20887 xrashmic - SASKEN
 	Description: Current state of FDN not highlighted
-	Fix: Instead of showing the submenu directly we call this function 
+	Fix: Instead of showing the submenu directly we call this function
 	where we set the menu and also higlight the previously selected menu item
 
-  	June 25, 2004        REF: CRR 21547  xvilliva  
+  	June 25, 2004        REF: CRR 21547  xvilliva
 	Bug:	Taking blank entries in phonebook if select book is either SIM or Phone.
 	Fix:	 We check for presence of either phone number or name before add/modify.
 
- 	Jun 23, 2004        	REF: CRR MMI-SPR-21636  Rashmi C N(Sasken) 
+ 	Jun 23, 2004        	REF: CRR MMI-SPR-21636  Rashmi C N(Sasken)
 	Description:		The confirmation for deleting entry from address book was a timed confirmation
   					screen.
   	Solution:			Now the time is set to 'FOREVER' from 'TEN_SECS'
 
-	Issue Number : SPR#12722 on 29/03/04 by Deepa M.D 
+	Issue Number : SPR#12722 on 29/03/04 by Deepa M.D
 
 
   25/10/00      Original Condat(UK) BMI version.
@@ -192,7 +192,7 @@
 #endif
 #include "psa_sim.h"  // June 22, 2006 REF: DRT OMAPS00081761  x0012849
 
-#define TRACE_PB_DEBUG 
+#define TRACE_PB_DEBUG
 
 extern int menuFDN;
 extern T_call call_data;
@@ -210,7 +210,7 @@
 BOOL ipbBookAvailable = FALSE;
 #endif
 
-  // June 14, 2006 REF: OMAPS00079308  x0039928  
+  // June 14, 2006 REF: OMAPS00079308  x0039928
   // Fix: All optimized code is put under flag FF_MMI_PB_OPTIM
 #ifdef FF_MMI_PB_OPTIM
 # define PB_MAX_FIND_ENTRIES   1
@@ -232,8 +232,8 @@
 
 /* Sep 20, 2006 REF: OMAPS00145786  x0080701 (Bharat) -- Start */
 
-extern BOOL addname_flag;	
-		
+extern BOOL addname_flag;
+
 extern BOOL changename_flag;
 
 static void mmi_int_phb_store_change_completion();
@@ -265,7 +265,7 @@
     T_phbk          *Phbk       = data->phbk;
 
 	TRACE_EVENT_P1("bookDeleteEntryCB index %d", Phbk->current.entry[Phbk->current.selectedName].index);
-	
+
     /* This call back is invoked from the delete entry dialog confirmation
        screen, and will only respond to the left key (OK) being selected.
     */
@@ -332,7 +332,7 @@
 void bookInitialise( MfwHnd parent )
 {
   TRACE_FUNCTION( "bookInitialise()" );
-  
+
   /* SPR#1112 - SH - Added E_PHB_READY and E_PHB_BUSY */
   phb  = phb_create( 0, (MfwEvt) (E_PHB_UPN_LIST | E_PHB_ERROR | E_PHB_STATUS
   	| E_PHB_READY | E_PHB_BUSY), (MfwCb) bookEvent );
@@ -359,7 +359,7 @@
 {
 	UBYTE intphonebook;
 	T_MFW ret;
-	
+
 	ret = GI_pb_GetPhonebook(&intphonebook);
 
 	if (ret==MFW_PHB_OK)
@@ -375,7 +375,7 @@
 	}
 	else
 		bookSetBookAvailable(FALSE);
-	
+
 	return;
 }
 
@@ -573,7 +573,7 @@
  $Function:     bookShowInfoScreen
 
  $Description:  SPR1112 - SH - Show an info screen
- 
+
  $Returns:    none
 
  $Arguments: parent, window,
@@ -592,7 +592,7 @@
 
     dlg_initDisplayData_TextId(&display_info, TxtNull, TxtNull, txtId1, txtId2, COLOUR_BOOK_POPUP);
     dlg_initDisplayData_events(&display_info, (T_VOID_FUNC)cb_function, Time, KEY_CLEAR);
-    
+
     display_info.Identifier	= Identifier;
 
     /* Call Info Screen
@@ -627,9 +627,9 @@
     int lenNum;
     int lenNumPB;
     int firstNotMatch=0;
-	
-
- 
+
+
+
 
     TRACE_FUNCTION("bookFindIndexMatchPB()");
 
@@ -655,12 +655,12 @@
 #ifdef TRACE_PB_DEBUG
     TRACE_EVENT_P1("Len of number: %d", lenNum);
 #endif /* TRACE_PB_DEBUG */
-    
+
     /* Loop round number of entries */
     for (i=0; i<numEntries; i++)
     {
         char* entryPB = (char*)listPB->entry[i].number;
-        
+
         /* Calculate length of number in PB entry */
         lenNumPB = strlen(entryPB);
 
@@ -690,7 +690,7 @@
                 /* Digits don't match */
                 firstNotMatch=1;
             }
-            
+
             /* Increment index to point at next set of digits */
             j = j + 1;
         }
@@ -735,7 +735,7 @@
 int bookFindNameInPhonebook( const char *p_pszNumber, T_MFW_PHB_ENTRY *p_pEntry )
 {
   int result;
-  
+
   TRACE_FUNCTION( "bookFindNameInPhonebook()" );
 
   if(p_pszNumber == 0 || p_pEntry == 0)
@@ -743,9 +743,9 @@
 
   if (strlen(p_pszNumber) < 1)
     return (0);
- 
+
   result = bookFindNameInSpecificPhonebook(p_pszNumber, p_pEntry);
-  
+
   #ifdef INT_PHONEBOOK
   /* If not found in internal phonebook, try SIM */
 
@@ -756,7 +756,7 @@
   	bookSetBookSelected(TRUE);
   }
   #endif
-  
+
   return result;
 }
 
@@ -781,17 +781,17 @@
 #ifdef NO_ASCIIZ
 	T_MFW_PHB_TEXT p_pszNumberText;
 #endif
-  
+
   T_MFW_PHB_LIST  phb_list;    //, new_list;  // RAVI
 
   SHORT     phb_index = 0;
   UBYTE     l_name[MAX_ALPHA_LEN];
-  // June 14, 2006 REF: OMAPS00079308  x0039928  
+  // June 14, 2006 REF: OMAPS00079308  x0039928
   // Fix: All optimized code is put under flag FF_MMI_PB_OPTIM
   #ifndef FF_MMI_PB_OPTIM
   T_MFW_PHB_ENTRY temp_pEntry[PB_MAX_FIND_ENTRIES];
   #endif
- 
+
 /*MC SPR 1319*/
 #ifdef EASY_TEXT_ENABLED
 #ifndef FF_MMI_PB_OPTIM
@@ -802,10 +802,10 @@
   int indexMatch;
   int ret;
 
-  
+
   if(p_pszNumber == 0 || p_pEntry == 0)
     return (0);
-  
+
   if (strlen(p_pszNumber) < 1)
 	return (0);
 
@@ -817,22 +817,22 @@
   phb_list.entry = temp_pEntry;
   #endif
   phb_list.num_entries = PB_MAX_FIND_ENTRIES;
-    
+
   /* Search phonebook for up to 4 entries with the last 6 digits matching number */
 
 #ifdef NO_ASCIIZ
   /* GW Set up data structure for NO_ASCIIZ */
-  
+
   p_pszNumberText.dcs = MFW_DCS_8bits;
   p_pszNumberText.len = strlen(p_pszNumber);
-  
+
   // strcpy((char*)p_pszNumberText.data, p_pszNumber);
   /* cq15688  copy number into the  text info structure using memcpy() instead of strcpy()3/03/04 MZ */
   //Jul 29, 2004    REF: CRR 20888  Deepa M.D
   //First memset the structure and then memcpy.
   memset(p_pszNumberText.data, 0, sizeof(p_pszNumberText.data));
   memcpy( (char*)p_pszNumberText.data, p_pszNumber , p_pszNumberText.len );
-  
+
   ret = phb_find_entries(
 	  bookActiveBook(READ),   /* phonebook                */
 	  &phb_index,				/* returns index in phb     */
@@ -841,7 +841,7 @@
 	  &p_pszNumberText,  /* search this pattern      */
 	  &phb_list				/* return structure         */
 	  );
-  
+
 #else
   ret = phb_find_entries(
 	  bookActiveBook(READ),   /* phonebook                */
@@ -858,7 +858,7 @@
     {
 		return (0);
     }
-	
+
 
     /* SPR#1727 - DS - Examine returned PB entries and find best match */
     indexMatch = bookFindIndexMatchPB(&phb_list, phb_list.num_entries, p_pszNumber);
@@ -890,7 +890,7 @@
 #ifdef EASY_TEXT_ENABLED
 #ifndef FF_MMI_PB_OPTIM
 	for (k=0;k<p_pEntry->name.len; k++)
-	{	
+	{
 	    if (p_pEntry->name.data[k]==0 )
 	    {
 		  debug[k] = '0';
@@ -900,10 +900,10 @@
 	        debug[k] = p_pEntry->name.data[k];
 	    }
 	}
-	TRACE_EVENT_P1("BFNIP: %s ", debug);	
+	TRACE_EVENT_P1("BFNIP: %s ", debug);
 #endif
 
-	/*MC SPR 1257, replacing PHB_MAX_LEN with MAX_ALPHA_LEN for name strings*/	
+	/*MC SPR 1257, replacing PHB_MAX_LEN with MAX_ALPHA_LEN for name strings*/
 	if (p_pEntry->name.data[0] == 0x80) /* Unicode 0x80 style */
 	{
 	       /*MC, removed var "actual_length*/
@@ -911,25 +911,25 @@
              for (i=1; i<MAX_ALPHA_LEN; i+=1)
         	{
         		l_name[i+1] = p_pEntry->name.data[i];
-        		
+
         	}
-	       l_name[0] =	p_pEntry->name.data[0]; 
+	       l_name[0] =	p_pEntry->name.data[0];
 	       l_name[1] = MAX_ALPHA_LEN;
-			
+
 		memcpy( p_pEntry->name.data, (char*)l_name, MAX_ALPHA_LEN );
-		
+
 	      if (p_pEntry->name.len%2 == 1)/*if length of string odd*/
 	      {
    		    p_pEntry->name.len++; /*MC we have to increase the length by one as we've shifted the string up*/
 	      }
 
    	      /*MC, ensure all the chars in the string after string length are 0*/
-  	     for (i=p_pEntry->name.len; i<MAX_ALPHA_LEN; i++)	 		
+  	     for (i=p_pEntry->name.len; i<MAX_ALPHA_LEN; i++)
   	     {
    	          p_pEntry->name.data[i]= 0;
   	     }
 
-#ifndef FF_MMI_PB_OPTIM 	     
+#ifndef FF_MMI_PB_OPTIM
 	     for (k=0;k<p_pEntry->name.len; k++)
 	     {
                 if (p_pEntry->name.data[k]==0 )
@@ -946,7 +946,7 @@
 
 	      sprintf(debug, "Length of phonebook entry:%d", p_pEntry->name.len);
 #endif
-	
+
 	}
        else
 #endif /* EASY_TEXT_ENABLED */
@@ -968,14 +968,14 @@
 	    	p_pEntry->name.dcs = MFW_ASCII;
 	    	memcpy(p_pEntry->name.data, l_name, MAX_ALPHA_LEN);
 	    }
-	    
+
 	}
 	/* Marcus: Issue 963: 11/09/2002: End */
 /*MC end*/
 #else
   	bookGsm2Alpha( (UBYTE *) p_pEntry->name );
 #endif /* NO_ASCIIZ */
-  
+
   return (1);
 }
 
@@ -987,11 +987,11 @@
  $Function:    	bookFindNumberByPosition
 
  $Description:	locate a number given the index
- 
+
  $Returns:		0 if failure, 1 otherwise
 
  $Arguments:	index of the number to find, p_pentry, return structure
- 
+
 *******************************************************************************/
 
 UBYTE bookFindNumberByPosition (UBYTE index,T_MFW_PHB_ENTRY* p_pEntry)
@@ -1035,15 +1035,15 @@
 			{	for (i=1; i<MAX_ALPHA_LEN; i+=1)
 				{
 					l_name[i+1] = p_pEntry->name.data[i];
-					
+
 				}
-	       	 	l_name[0] =	p_pEntry->name.data[0]; 
+	       	 	l_name[0] =	p_pEntry->name.data[0];
 	       		l_name[1] = MAX_ALPHA_LEN;
-			
+
 				memcpy( p_pEntry->name.data, (char*)l_name, MAX_ALPHA_LEN );
 
    		 		p_pEntry->name.len++;/* = actual_length;*/
-				
+
 			}
 		else
 	#endif
@@ -1142,7 +1142,7 @@
   {
   return;
   }
-  
+
   for ( index = 0; index < length; index++ )
     alpha[index] = alpha[index] & 0x7F;
 }
@@ -1167,19 +1167,19 @@
   TRACE_FUNCTION( "bookActiveBook()" );
 
 /* SPR#1112 - SH - Return internal phonebook ID when appropriate */
-// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken) 
+// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken)
 //	To get FDN book, when FDN is disabled, but only when accessing from FDM menu and not while we are in active call
 
 	if(menuFDN && (call_data.calls.numCalls==0))
-	{		
-		return  PHB_FDN;		
+	{
+		return  PHB_FDN;
 	}
 
 #ifdef INT_PHONEBOOK
   if (bookGetBookAvailable() && bookGetBookSelected())
   	return PHB_IPB;
 #endif
-// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken) 
+// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken)
 //	When FDN is disabled we need to display only ADN entries in the phonebook menu.
 //	We now return PHB_ADN instead of PHB_ADN_FDN.
 
@@ -1212,7 +1212,7 @@
   char            Buffer[16];
   int TxtToShow;
 
-	
+
     /* Determine which book we are currently using
     */
     data->phbk->current.status.book = bookActiveBook(READ);
@@ -1220,9 +1220,9 @@
     /* retrieve he status of the book, and create a string for output
        based on the status
     */
-   #if(BOARD!=61) 
+   #if(BOARD!=61)
       Buffer[0] = '\0';   // OMAPS00042166 - RAVI /*a0393213 warnings removal-== changed to =*/
-    #endif  
+    #endif
     if ( bookGetCurrentStatus( &data->phbk->current.status ) == MFW_PHB_OK )
   {
   /* SPR#1112 - Internal phonebook - show the current selected phonebook*/
@@ -1286,7 +1286,7 @@
   */
 	dlg_initDisplayData_TextId( &Dialog, TxtSoftOK, TxtCancel, TxtPressOk, TxtDelete, COLOUR_STATUS);
 
-//  	Jun 23, 2004        	REF: CRR MMI-SPR-21636  Rashmi C N(Sasken) 
+//  	Jun 23, 2004        	REF: CRR MMI-SPR-21636  Rashmi C N(Sasken)
 //	Description:		The confirmation for deleting entry from address book was a timed confirmation
 //  					screen.
 // 	Solution:			Now the time is set to 'FOREVER' from 'TEN_SECS'
@@ -1302,11 +1302,11 @@
  $Function:    	bookActivateFDN
 
  $Description:	information screen to tell user to activate FDN
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 void bookActivateFDN( T_MFW_HND window )
@@ -1332,11 +1332,11 @@
  $Function:		bookInputStartNumberEditor
 
  $Description:	Start the input handler using default properties
- 
+
  $Returns:		Handle of newly created window, or NULL if failure
 
  $Arguments:	parent, parent window handle, buffer, input buffer
- 
+
 *******************************************************************************/
 
 MfwHnd bookInputStartNumberEditor( MfwHnd parent, void *buffer )
@@ -1362,12 +1362,12 @@
                 // June 22, 2006 REF: DRT OMAPS00081761  x0012849
                 // When EXT1 is not supported Number can be upto 20 characters.
                 editor_num_length = OLD_NUM_LENGTH;
-                TRACE_EVENT("EXT1 is not supported for this SIM");             
-            }             
+                TRACE_EVENT("EXT1 is not supported for this SIM");
+            }
             break;
 
         case   PHB_FDN:
-            TRACE_EVENT("FDN book is selcted");            
+            TRACE_EVENT("FDN book is selcted");
             // June 22, 2006 REF: DRT OMAPS00081761  x0012849
             //If EXT2 is present in service table then the FDN phone number can go upto 40 digits.
             if (sim_serv_table_check(SRV_EXT2) == ALLOCATED_AND_ACTIVATED)
@@ -1380,20 +1380,20 @@
                  // June 22, 2006 REF: DRT OMAPS00081761  x0012849
                  // When EXT1 is not supported Number can be upto 20 characters.
                 editor_num_length = OLD_NUM_LENGTH;
-                TRACE_EVENT("EXT2 is not supported for this SIM");             
-            }                
+                TRACE_EVENT("EXT2 is not supported for this SIM");
+            }
             break;
 
         case   PHB_IPB: // Internal phone book
             TRACE_EVENT("IPB - Internal phone book selected");
-            editor_num_length = NUMBER_LENGTH; 
-            break;            
+            editor_num_length = NUMBER_LENGTH;
+            break;
         default:
             TRACE_EVENT("Selected phone book is other than ADN,FDN,IPB");
-            editor_num_length = NUMBER_LENGTH;             
+            editor_num_length = NUMBER_LENGTH;
             break;
-    }    
-    
+    }
+
     TRACE_EVENT_P1 ("Number length = %d ",editor_num_length);
 	AUI_edit_SetDefault(&editor_data);
 	AUI_edit_SetDisplay(&editor_data, NUMBER_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
@@ -1421,11 +1421,11 @@
  $Function:		bookInputStartNameEditor
 
  $Description:	Start the input handler using default properties
- 
+
  $Returns:		Handle of newly created window, or NULL if failure
 
  $Arguments:	parent, parent window handle, buffer, input buffer
- 
+
 *******************************************************************************/
 
 MfwHnd bookInputStartNameEditor( MfwHnd parent, void *buffer )
@@ -1468,10 +1468,10 @@
 			chinese_data.TextString[1] = 0x7F;
 		}
 		else
-		{	
+		{
 			if (chinese_data.TextString[0]!= (char)0x80)/*If ASCII string*//*a0393213 lint warnings removal-typecast done*/
 			{
-			
+
 			/*SPR 1752, if ASCII string, use a latin editor*/
 				AUI_edit_SetDefault(&editor_data);
 				AUI_edit_SetDisplay(&editor_data, NUMBER_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
@@ -1522,11 +1522,11 @@
  $Function:		bookInputDestroy
 
  $Description:	Destroy Input Window
- 
+
  $Returns:		None
 
  $Arguments:	Handle of window to be destroyed
- 
+
 *******************************************************************************/
 
 void bookInputDestroy( MfwHnd window )
@@ -1563,7 +1563,7 @@
 	switch (reason)
     {
 		case INFO_KCD_LEFT:
-        {	
+        {
             /* Construct a new entry to be written to the phone book
             */
 
@@ -1583,21 +1583,21 @@
             if ( Phbk->UpdateAction == CREATE_ENTRY )
 				storeInFile( Phbk );
             else if ( Phbk->UpdateAction == MODIFY_EXISTING )
-				changeInFile( Phbk );				
+				changeInFile( Phbk );
             bookShowInformation( win, MmiBookCurrentText(), NULL,NULL );
 
 			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- Start */
 			mmi_int_phb_store_change_completion();
-			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- End */			
-			
+			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- End */
+
 	}
 	else
-		bookShowInformation( win, TxtInvalidInput, NULL,NULL );	
+		bookShowInformation( win, TxtInvalidInput, NULL,NULL );
 
             /* And shut down, clearing the number and name windows as we go
             */
             if ( Phbk->input_number_win )
-            {    
+            {
  				AUI_edit_Destroy(Phbk->input_number_win);
     		    Phbk->input_number_win = 0;
     		}
@@ -1610,7 +1610,7 @@
 		if ( Phbk->UpdateAction == MODIFY_EXISTING )
 			timStart(PhbSearchTim);
 
-			/*MC-- get rid of search window(and options menu), if just changed a chinese entry 
+			/*MC-- get rid of search window(and options menu), if just changed a chinese entry
 			(prevent showing scrambled entry)*/
 			if ( Phbk->UpdateAction == MODIFY_EXISTING && Mmi_getCurrentLanguage()==CHINESE_LANGUAGE)
 			{
@@ -1706,7 +1706,7 @@
   switch (reason)
     {
 		case INPUT_LEFT:
-        {	
+        {
 
             /* Construct a new entry to be written to the phone book
             */
@@ -1726,13 +1726,13 @@
             else if ( Phbk->UpdateAction == MODIFY_EXISTING )
           changeInFile( Phbk );
 
-				
+
             bookShowInformation( win, MmiBookCurrentText(), NULL,NULL );
 
 			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- Start */
 			mmi_int_phb_store_change_completion();
-			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- End */			
-				
+			/* Sep 20, 2006 REF: OMAPS00145786	x0080701 (Bharat) -- End */
+
 
             /* And shut down, clearing the number and name windows as we go
             */
@@ -1747,17 +1747,17 @@
 			Phbk->input_name_win = 0;
 
 #ifdef NO_ASCIIZ
-/*MC-- get rid of search window(and options menu), if just changed a chinese entry 
+/*MC-- get rid of search window(and options menu), if just changed a chinese entry
 (prevent showing scrambled entry)*/
 			if ( Phbk->UpdateAction == MODIFY_EXISTING &&Mmi_getCurrentLanguage()==CHINESE_LANGUAGE)
 			{	bookMenuDestroy(Phbk->menu_options_win);
 				Phbk->menu_options_win=0;
 				bookSearchDestroy( Phbk->search_win);
 				Phbk->search_win=0;
-				
+
 			}
 #endif
-			
+
 
         }
 		break;
@@ -1830,7 +1830,7 @@
 }
 
 #endif /* NEW_EDITOR */
-// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken) 
+// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken)
 // This is called when we exit the FDN Numbers menu. So unsetting the menuFDN flag here
 
 void fdn_menu_cb(T_MFW_HND parent_win, UBYTE identifier, UBYTE reason)
@@ -1839,7 +1839,7 @@
 	menuFDN=0;
 }
 
-// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken) 
+// May 3, 2004        REF: CRR MMI-SPR-18555  Rashmi C N(Sasken)
 // This is called to display the FDN Numbers menu. The menuFDN flag is set here
 
 int bookFDNMenu(MfwMnu* menu, MfwMnuItem* item)
@@ -1847,15 +1847,15 @@
 	T_MFW_HND 		win = mfw_parent(mfw_header());
 	T_MFW_WIN		*win_data	= ((T_MFW_HDR *) win)->data;
 	tBookStandard	*data		= (tBookStandard *) win_data->user;
-	
-
-	
+
+
+
 	menuFDN=1;
-  	// Sep 29, 2004        REF: CRR 25041  xvilliva  
-	// The bookMenuStart() is called with the window data->phbk->win, 
-	// similar to the function bookFDNMenu() to avoid crash. The menu window 
-	// thus created is stored, which will be deleted while phonebook menu is 
-	// destroyed. 
+  	// Sep 29, 2004        REF: CRR 25041  xvilliva
+	// The bookMenuStart() is called with the window data->phbk->win,
+	// similar to the function bookFDNMenu() to avoid crash. The menu window
+	// thus created is stored, which will be deleted while phonebook menu is
+	// destroyed.
 	data->phbk->menu_call_options_win_2 = bookMenuStart( data->phbk->win, bookNameMenuFDNAttributes(),0);
 	SEND_EVENT(data->phbk->menu_call_options_win_2, ADD_CALLBACK, NULL, (void *)fdn_menu_cb);
 
@@ -1864,7 +1864,7 @@
 
 // Jul 28, 2004       	REF: CRR:20887 xrashmic - SASKEN
 // Description: Current state of FDN not highlighted
-// Fix: Instead of showing the submenu directly we call this function 
+// Fix: Instead of showing the submenu directly we call this function
 // where we set the menu and also higlight the previously selected menu item
 
 extern MfwMnuAttr *FDNMenu(void);
@@ -1878,11 +1878,11 @@
 	T_MFW_WIN		*win_data	= ((T_MFW_HDR *) win)->data;
 	tBookStandard	*data		= (tBookStandard *) win_data->user;
 
-  	// Sep 29, 2004        REF: CRR 25041  xvilliva  
-	// The bookMenuStart() is called with the window data->phbk->win, 
-	// similar to the function bookFDNMenu() to avoid crash. The menu window 
+  	// Sep 29, 2004        REF: CRR 25041  xvilliva
+	// The bookMenuStart() is called with the window data->phbk->win,
+	// similar to the function bookFDNMenu() to avoid crash. The menu window
 	// thus created is stored, which will be deleted while phonebook menu is
-	// destroyed. 
+	// destroyed.
 	data->phbk->menu_options_win_2= bookMenuStart(data->phbk->win, FDNMenu(), 0);
 	CurSel = (phb_get_mode() == PHB_RESTRICTED)?FIRSTMENUITEM:SECONDMENUITEM;
 	SEND_EVENT(data->phbk->menu_options_win_2, DEFAULT_OPTION, NULL, &CurSel);
@@ -1930,13 +1930,13 @@
 static void mmi_int_phb_store_change_completion()
 {
 	/* Reset the "add" and "change" flags only incase of Internal PHB */
-	if ( bookGetBookSelected() == TRUE ) 
+	if ( bookGetBookSelected() == TRUE )
 	{
-		addname_flag = FALSE;	
-			
+		addname_flag = FALSE;
+
 		changename_flag = FALSE;
 	}
-	
+
 	return;
 }