changeset 168:464d69ef83e2

mmiSettings.c: bogotab fixes
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 17 Jan 2021 23:20:41 +0000
parents 897bdea4cb0b
children adae850f9857
files src/ui/bmi/mmiSettings.c
diffstat 1 files changed, 155 insertions(+), 194 deletions(-) [+]
line wrap: on
line diff
--- a/src/ui/bmi/mmiSettings.c	Sun Jan 17 22:44:15 2021 +0000
+++ b/src/ui/bmi/mmiSettings.c	Sun Jan 17 23:20:41 2021 +0000
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-					CONDAT (UK)
+			CONDAT (UK)
 
 ********************************************************************************
 
@@ -11,12 +11,12 @@
 
  $Project name:	Basic MMI
  $Project code:	BMI (6349)
- $Module:		Settings
- $File:		    MmiSettings.c
- $Revision:		1.0
+ $Module:	Settings
+ $File:		MmiSettings.c
+ $Revision:	1.0
 
- $Author:		Condat(UK)
- $Date:		    25/10/00
+ $Author:	Condat(UK)
+ $Date:		25/10/00
 
 ********************************************************************************
 
@@ -44,8 +44,8 @@
 	May 30, 2006  DR: OMAPS00070657 x0pleela
 	Description: CPHS feature on Locosto-Lite
 	Solution: For ALS feature,
-			a) Updating function "setUserSettings2Default ()" to memset Line1 and line2
-				fields of FFS_flashData
+	a) Updating function "setUserSettings2Default ()" to memset Line1 and line2
+	fields of FFS_flashData
 
 	Apr 06, 2006    ERT: OMAPS00070660 x0039928(sumanth)
    	Description: Need to reduce flash foot-print for Locosto Lite
@@ -77,19 +77,19 @@
  	Jul 28, 2004 REF: CRR 20899 xkundadu
 	Description: No identification for user whether 'Any-key-Answer' is On/Off
 	Solution: The menu focus will be on the 'On' menu  if the 'Any key
-			answer' is enabled, otherwise focus will be on 'Off' menu item.
-			Changed "submenu" to "menuItem" to call a function, to set focus to
-			the selected option.Added  function settingsFocusCurSelAnyKeyAns()
-			to set the focus to selected item.
+	answer' is enabled, otherwise focus will be on 'Off' menu item.
+	Changed "submenu" to "menuItem" to call a function, to set focus to
+	the selected option.Added  function settingsFocusCurSelAnyKeyAns()
+	to set the focus to selected item.
 
 
 	Jul 29, 2004 REF: CRR 20898 xkundadu
 	Description: No identification for user whether 'Auto-Answer' is On/Off
 	Solution: The menu focus will be on the 'On' menu  if the 'Auto
-			answer' is enabled, otherwise focus will be on 'Off' menu item.
-			Changed 'submenu' to 'menuItem' to call a function, which sets the
-			focus to the selected option. Added the function
-			settingsFocusCurSelAutoAns() to set the focus to selected item.
+	answer' is enabled, otherwise focus will be on 'Off' menu item.
+	Changed 'submenu' to 'menuItem' to call a function, which sets the
+	focus to the selected option. Added the function
+	settingsFocusCurSelAutoAns() to set the focus to selected item.
 
 
 	 Jul 22,2004 CRR:20896 xrashmic - SASKEN
@@ -219,19 +219,18 @@
 /* static DisplayData DisplayInfo;   x0039928 - Lint warning fix */
 
 
-
 #define SHOW_CONFIRM           3
 #define ACTIVATE_CONFIRM       4
 #define DEACTIVATE_CONFIRM     5
 #define FACTORY_RESET          6
 
-UBYTE reply_path_bit =0;
+UBYTE reply_path_bit = 0;
 
 typedef struct
 {
   T_MMI_CONTROL    mmi_control;
   T_MFW_HND        confirm_win;        /* MFW win handler      */
-  UBYTE 		   local_status;
+  UBYTE 	   local_status;
 } T_confirm;
 
 T_confirm confirm_data;
@@ -241,11 +240,8 @@
  * Settings menu subs:
  */
 
-
-
-
 #define ON  	0
-#define OFF		1
+#define OFF	1
 #define CLEAR	2
 
 
@@ -267,7 +263,7 @@
     ANYKEYANSWER,
     CALLTIMERS,
     KEYPAD_CLICK,
- 	KEYPAD_DTMF,
+    KEYPAD_DTMF,
     KEYPAD_SILENT,
 #ifndef FF_NO_VOICE_MEMO
     VOICE_MEMO,
@@ -279,11 +275,10 @@
 }T_FACTORY_RESET_LIST;
 
 
-
 T_settings DEFAULT_SETTINGS[] =
 {
-	{ENGLISH,		ON},		//select the Language:English as a default
-	{GERMAN,		OFF},
+	{ENGLISH,	ON},		//select the Language:English as a default
+	{GERMAN,	OFF},
 	{AUTOREDIAL,	OFF},
 	{AUTOANSWER,	OFF},
 	{ANYKEYANSWER,	OFF},
@@ -295,9 +290,9 @@
 	{VOICE_MEMO,	CLEAR},
 #endif
 #ifdef FF_POWER_MANAGEMENT
-	{LCD_REFRESH,           ON}, /*OMAPS00098881 (removing power variant) a0393213(Prabakar)*/
+	{LCD_REFRESH,   ON}, /*OMAPS00098881 (removing power variant) a0393213(Prabakar)*/
 #endif
-	{MAX,			0xFF}
+	{MAX,		0xFF}
 };
 
 /*******************************************************************************
@@ -307,26 +302,26 @@
  $Description:	Store the validity period information, selected by the user.
 
 
- $Returns:		Execution status
+ $Returns:	Execution status
 
  $Arguments:	m - menu handler
- 				i - Menu item selected
+ 		i - Menu item selected
 
 *******************************************************************************/
 int SmsValidityPeriod(MfwMnu* m, MfwMnuItem* i)
 {
-	T_MFW_SMS_INFO	sms_parameter;
-	UBYTE index = 0;  // RAVI - Assigned 0.
-	T_DISPLAY_DATA DisplayInfo;
-	int txtId = 0;  // RAVI - Assigned 0.
+    T_MFW_SMS_INFO	sms_parameter;
+    UBYTE index = 0;  // RAVI - Assigned 0.
+    T_DISPLAY_DATA DisplayInfo;
+    int txtId = 0;  // RAVI - Assigned 0.
 
     T_MFW_HND win  = mfwParent(mfw_header());
 
     TRACE_FUNCTION(">>>> SmsValidityPeriod()");
 
-      /*SPR#1952 - DS - Show the new period setting on pop-up dialog */
-	switch (m->lCursor[m->level])
-	{
+    /*SPR#1952 - DS - Show the new period setting on pop-up dialog */
+    switch (m->lCursor[m->level])
+    {
 	case 0:
 		txtId = Txt1Hour;
 		index = VP_REL_1_HOUR;
@@ -348,29 +343,29 @@
 		index = VP_REL_MAXIMUM;    //  May 10, 2004    REF: CRR 15753  Deepa M.D
 		break;
 
-	}
+    }
 
-	/* API - 28/07/03 - CQ10203 -  Read the Data and then set the REL VP identifier*/
-	SmsSend_get_config_data(&sms_parameter);
+    /* API - 28/07/03 - CQ10203 -  Read the Data and then set the REL VP identifier*/
+    SmsSend_get_config_data(&sms_parameter);
 
-	FFS_flashData.vp_rel = index;
-	flash_write();
+    FFS_flashData.vp_rel = index;
+    flash_write();
 
-	sms_parameter.vp_rel = FFS_flashData.vp_rel;
-	TRACE_EVENT_P1("sms_parameter.vp_rel = %d", sms_parameter.vp_rel);
-	/*API - CQ10203 END*/
+    sms_parameter.vp_rel = FFS_flashData.vp_rel;
+    TRACE_EVENT_P1("sms_parameter.vp_rel = %d", sms_parameter.vp_rel);
+    /*API - CQ10203 END*/
 
-	if (sms_set_val_period(&sms_parameter) == MFW_SMS_OK)
-		dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtCancel,TxtSmsValidityPeriodSet, txtId /*SPR#1952*/, COLOUR_STATUS);
-	else
-		dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtCancel,TxtFailed, TxtNull, COLOUR_STATUS);
+    if (sms_set_val_period(&sms_parameter) == MFW_SMS_OK)
+	dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtCancel,TxtSmsValidityPeriodSet, txtId /*SPR#1952*/, COLOUR_STATUS);
+    else
+	dlg_initDisplayData_TextId( &DisplayInfo, TxtNull, TxtCancel,TxtFailed, TxtNull, COLOUR_STATUS);
 
-	dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT|KEY_CLEAR );
+    dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT|KEY_CLEAR );
 
-	// Display confirmation screen.
-	info_dialog(win,&DisplayInfo);
+    // Display confirmation screen.
+    info_dialog(win,&DisplayInfo);
 
-	return 1;
+    return 1;
 }
 
 
@@ -381,19 +376,19 @@
 
  $Description:	Activate/Deactivate SRR, selected by the user.
 
- $Returns:		Execution status
+ $Returns:	Execution status
 
  $Arguments:	m - menu handler
- 				i - Menu item selected
+ 		i - Menu item selected
 
 *******************************************************************************/
 int SmsStatusReportRequest(MfwMnu* m, MfwMnuItem* i)
 {
-	int index = m->lCursor[m->level];
-	T_DISPLAY_DATA DisplayInfo;
+    int index = m->lCursor[m->level];
+    T_DISPLAY_DATA DisplayInfo;
     T_MFW_SMS_INFO sms_info;
     T_MFW_HND win  = mfwParent(mfw_header());
-	int TextId2;
+    int TextId2;
     TRACE_FUNCTION(">>>> SmsStatusReportRequest()");
 
     if (sms_parameter(&sms_info, TRUE) == MFW_SMS_OK)
@@ -411,13 +406,13 @@
             else
             	TextId2      = TxtOn;
 
-		dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtSRR, TextId2, COLOUR_POPUP);
-		dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
+	    dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtSRR, TextId2, COLOUR_POPUP);
+	    dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
 
-        	info_dialog(win,&DisplayInfo);
+            info_dialog(win,&DisplayInfo);
         }
     }
-	return 1;
+    return 1;
 }
 /* Marcus: Issue 1170: 30/09/2002: End */
 
@@ -432,21 +427,20 @@
 
  $Description:	Activate/Deactivate  reply path, selected by the user.
 
- $Returns:		Execution status
+ $Returns:	Execution status
 
  $Arguments:	m - menu handler
- 				i - Menu item selected
-
+ 		i - Menu item selected
 
 *******************************************************************************/
 
 int SmsReplyPathRequest(MfwMnu* m, MfwMnuItem* i)
 {
-	int index = m->lCursor[m->level];
-	T_DISPLAY_DATA DisplayInfo;
+    int index = m->lCursor[m->level];
+    T_DISPLAY_DATA DisplayInfo;
     T_MFW_SMS_INFO sms_info;
     T_MFW_HND win  = mfwParent(mfw_header());
-	int TextId2;
+    int TextId2;
     TRACE_FUNCTION(">>>> SmsReplyPathRequest()");
 
     if (sms_parameter(&sms_info, TRUE) == MFW_SMS_OK)
@@ -458,18 +452,18 @@
 
         TRACE_EVENT_P1("The reply paTH BIT IS  = %d", reply_path_bit);
 
-            if (index == 0)
-            	TextId2      = TxtOff;
-            else
-            	TextId2      = TxtOn;
+        if (index == 0)
+		TextId2      = TxtOff;
+        else
+		TextId2      = TxtOn;
 
-		dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtRP, TextId2, COLOUR_POPUP);
-		dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
+	dlg_initDisplayData_TextId( &DisplayInfo, TxtSoftOK, TxtNull,TxtRP, TextId2, COLOUR_POPUP);
+	dlg_initDisplayData_events( &DisplayInfo, (T_VOID_FUNC)NULL, THREE_SECS, KEY_RIGHT | KEY_LEFT );
 
-        	info_dialog(win,&DisplayInfo);
+       	info_dialog(win,&DisplayInfo);
 
     }
-	return 1;
+    return 1;
 }
 // End --11536
 
@@ -486,12 +480,8 @@
 
 *******************************************************************************/
 int settingsVoiceMail(MfwMnu* m, MfwMnuItem* i)
-
 {
-
-	cphs_get_mailbox ();
-
-
+    cphs_get_mailbox ();
     return 0;
 }
 
@@ -508,7 +498,6 @@
 *******************************************************************************/
 int settingsScNumber(MfwMnu* m, MfwMnuItem* i)
 {
-
     return 0;
 }
 /*******************************************************************************
@@ -524,7 +513,6 @@
 *******************************************************************************/
 void settingsInit (void)
 {
-
     TRACE_EVENT ("settingsInit()");
 
    /*  nextState = 0;  x0039928 - Lint warning fix */
@@ -586,8 +574,8 @@
 
  $Description:	Function to return the status of various BMI settings
 
- $Returns:		Non-zero number if setting is ON
- 				Zero if the setting is OFF
+ $Returns:	Non-zero number if setting is ON
+ 		Zero if the setting is OFF
 
  $Arguments:	flagBit - value indicating which setting is to be changed.
 
@@ -609,11 +597,11 @@
 
  $Description:	Function to set or clear the status of various BMI settings
 
- $Returns:		None.
+ $Returns:	None.
 
  $Arguments:	flagBit	- value indicating which setting is to be changed.
- 				state 	- SET_SETTING - set the value
- 						- CLEAR_SETTING - clear the value.
+ 		state 	- SET_SETTING - set the value
+ 			- CLEAR_SETTING - clear the value.
 GW SPR#2470 Created
 *******************************************************************************/
 void settingsSetStatus(unsigned int flagBit, int value)
@@ -647,19 +635,17 @@
 *******************************************************************************/
 int settingsAutoRedialOn(MfwMnu* m, MfwMnuItem* i)
 {
-
-   T_MFW_HND win = mfw_parent(mfw_header());
+    T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	cm_set_redial(CM_REDIAL_AUTO);
-
+    cm_set_redial(CM_REDIAL_AUTO);
 
     confirm_data.local_status = ACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
 
-	return 0;
+    return 0;
 }
 /*******************************************************************************
 
@@ -675,17 +661,15 @@
 int settingsAutoRedialOff(MfwMnu* m, MfwMnuItem* i)
 {
     T_MFW_HND win = mfw_parent(mfw_header());
- 	confirm_Init(win);
+    confirm_Init(win);
 
-	cm_set_redial(CM_REDIAL_OFF);
+    cm_set_redial(CM_REDIAL_OFF);
 
     confirm_data.local_status = DEACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
-
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
 
-
-	return 0;
+    return 0;
 }
 /*******************************************************************************
 
@@ -779,15 +763,15 @@
 {
     T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	FFS_flashData.settings_status |= SettingsAutoAnswerOn;
-	flash_write();
+    FFS_flashData.settings_status |= SettingsAutoAnswerOn;
+    flash_write();
     confirm_data.local_status = ACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
 
-	return 0;
+    return 0;
 }
 /*******************************************************************************
 
@@ -804,17 +788,15 @@
 {
     T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	FFS_flashData.settings_status &= ~SettingsAutoAnswerOn;
-	flash_write();
+    FFS_flashData.settings_status &= ~SettingsAutoAnswerOn;
+    flash_write();
     confirm_data.local_status = DEACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
-
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
 
-
-	return 0;
+    return 0;
 }
 
 
@@ -833,14 +815,14 @@
 {
     T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	FFS_flashData.settings_status |= SettingsAnyKeyAnswerOn;
-	flash_write();
+    FFS_flashData.settings_status |= SettingsAnyKeyAnswerOn;
+    flash_write();
     confirm_data.local_status = ACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
-	return 0;
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
+    return 0;
 }
 /*******************************************************************************
 
@@ -855,18 +837,17 @@
 *******************************************************************************/
 int settingsAnyKeyAnswerOff(MfwMnu* m, MfwMnuItem* i)
 {
-
     T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	FFS_flashData.settings_status &= ~SettingsAnyKeyAnswerOn;
-	flash_write();
+    FFS_flashData.settings_status &= ~SettingsAnyKeyAnswerOn;
+    flash_write();
     confirm_data.local_status = DEACTIVATE_CONFIRM;
 
-	SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
+    SEND_EVENT (confirm_data.confirm_win, SHOW_CONFIRM, 0, 0);
 
-	return 0;
+    return 0;
 }
 
 /*******************************************************************************
@@ -874,7 +855,7 @@
  $Function:    	factoryReset
 
  $Description:	Reset all the user-settings,
- 				At first it show up a confirmation screen
+		At first it show up a confirmation screen
  $Returns:
 
  $Arguments:
@@ -882,19 +863,17 @@
 *******************************************************************************/
 int factoryReset(MfwMnu* m, MfwMnuItem* i)
 {
-
     T_MFW_HND win = mfw_parent(mfw_header());
 
-	confirm_Init(win);
+    confirm_Init(win);
 
-	confirm_data.local_status = FACTORY_RESET;
+    confirm_data.local_status = FACTORY_RESET;
 
-	SEND_EVENT (confirm_data.confirm_win, FACTORY_RESET, 0, 0);
-	return 0;
+    SEND_EVENT (confirm_data.confirm_win, FACTORY_RESET, 0, 0);
+    return 0;
 }
 
 
-
 /*******************************************************************************
 
  $Function:    	setUserSettings2Default
@@ -910,22 +889,18 @@
 {
 	//char buf[30];  // RAVI
 
-
-
 	if (DEFAULT_SETTINGS[ENGLISH].status EQ ON)
 	{
 		// set the language :ENGLISH
 		MmiRsrcSetLang(ENGLISH_LANGUAGE);/*MC, SPR 1242 - changed to new function*/
 	}
 
-
 	if (DEFAULT_SETTINGS[GERMAN].status EQ ON)
 	{
 		// set the language :GERMAN
 		MmiRsrcSetLang(GERMAN_LANGUAGE);	/*MC, SPR 1242 - changed to new function*/
 	}
 
-
 	if (DEFAULT_SETTINGS[AUTOREDIAL].status EQ ON)
 	{
 		// set the Auto-redial
@@ -936,7 +911,6 @@
 		cm_set_redial(CM_REDIAL_OFF);
 	}
 
-
 	if (DEFAULT_SETTINGS[AUTOANSWER].status EQ ON)
 	{
 		// set the Autoanswer
@@ -948,7 +922,6 @@
 		FFS_flashData.settings_status &= ~SettingsAutoAnswerOn;
 	}
 
-
 	if (DEFAULT_SETTINGS[ANYKEYANSWER].status EQ ON)
 	{
 		// set the Anykeyanswer
@@ -966,7 +939,6 @@
 		//incoming, outgoing & last calls
 	}
 
-
 	if (DEFAULT_SETTINGS[KEYPAD_CLICK].status EQ ON)
 	{
 		// set the Keypad click
@@ -979,7 +951,6 @@
 		FFS_flashData.settings_status |= SettingsKeypadClick;
 	}
 
-
 	if (DEFAULT_SETTINGS[KEYPAD_DTMF].status EQ ON)
 	{
 		// set the Keypad DTMF
@@ -992,7 +963,6 @@
 		FFS_flashData.settings_status |= SettingsKeypadDTMF;
 	}
 
-
 	if (DEFAULT_SETTINGS[KEYPAD_SILENT].status EQ ON)
 	{
 		// set the Keypad silence
@@ -1014,8 +984,8 @@
 
        //xrashmic 7 Dec, 2004 MMI-SPR-26161 and MMI-SPR-23965
        // Resetting the downloaded and extracted wap objects
-       FFS_flashData.image_usr_obj=0;
-	FFS_flashData.audio_usr_obj =0;
+	FFS_flashData.image_usr_obj = 0;
+	FFS_flashData.audio_usr_obj = 0;
 
 #ifndef FF_NO_VOICE_MEMO
 	if (DEFAULT_SETTINGS[VOICE_MEMO].status EQ CLEAR)
@@ -1107,11 +1077,10 @@
 *******************************************************************************/
 void confirm_Exit (T_MFW_HND own_window)
 {
-
     T_MFW_WIN   * win_data = ((T_MFW_HDR *)own_window)->data;
     T_confirm * data     = (T_confirm *)win_data->user;
 
-  confirm_destroy (data->confirm_win);
+    confirm_destroy (data->confirm_win);
 }
 
 /*******************************************************************************
@@ -1224,13 +1193,12 @@
 
   TRACE_FUNCTION ("confirm_dialog()");
 
-
-	dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull,TxtNull, TxtNull , COLOUR_STATUS);
-	dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)confirm_dialog_cb, THREE_SECS, KEY_CLEAR | KEY_RIGHT | KEY_LEFT );
+  dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull,TxtNull, TxtNull , COLOUR_STATUS);
+  dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)confirm_dialog_cb, THREE_SECS, KEY_CLEAR | KEY_RIGHT | KEY_LEFT );
 
   if (confirm_data.local_status EQ ACTIVATE_CONFIRM)
   {
-	  display_info.TextId   = TxtActivated;
+     display_info.TextId   = TxtActivated;
   }
   else if (confirm_data.local_status EQ DEACTIVATE_CONFIRM)
   {
@@ -1238,20 +1206,19 @@
   }
   else if (confirm_data.local_status EQ FACTORY_RESET)
   {
-     display_info.TextId      = TxtPressOk;
-	 display_info.TextId2     = TxtReset;
-	 display_info.Time       = TEN_SECS;
+     display_info.TextId       = TxtPressOk;
+     display_info.TextId2      = TxtReset;
+     display_info.Time         = TEN_SECS;
      display_info.LeftSoftKey  = TxtSoftOK;
      display_info.RightSoftKey = TxtSoftBack;
-
   }
 
   /*
    * Call Info Screen
    */
   info_dialog (confirm_data.confirm_win, &display_info);
+}
 
-}
 /*******************************************************************************
 
  $Function:    	confirm_dialog_cb
@@ -1265,15 +1232,15 @@
 *******************************************************************************/
 void confirm_dialog_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason)
 {
-	TRACE_FUNCTION ("confirm_dialog_cb()");
+    TRACE_FUNCTION ("confirm_dialog_cb()");
 
-      switch (reason)
-      {
+    switch (reason)
+    {
         case INFO_KCD_LEFT:
-			// user confirm to reset all the user settings !
-			setUserSettings2Default ();
+	    // user confirm to reset all the user settings !
+	    setUserSettings2Default ();
             confirm_Exit(win);
-          break;
+            break;
 
         case INFO_TIMEOUT:
           /* no break; */
@@ -1283,8 +1250,8 @@
           /* no break; */
         case INFO_KCD_CLEAR:
             confirm_Exit(win);
-          break;
-      }
+            break;
+    }
 }
 
 /*******************************************************************************
@@ -1303,40 +1270,37 @@
  // T_MFW_WIN    * win_data = ((T_MFW_HDR *) win)->data;  // RAVI
  // T_confirm      * data     = (T_confirm *)win_data->user;    // RAVI
 
- TRACE_FUNCTION("confirm()");
+  TRACE_FUNCTION("confirm()");
 
- switch (event)
+  switch (event)
   {
     case SHOW_CONFIRM:
-		confirm_dialog();
-    break;
+	confirm_dialog();
+	break;
     case FACTORY_RESET:
-		confirm_dialog();
-    break;
+	confirm_dialog();
+	break;
+  }
+}
 
-  }
-
-}
 static void showSet (void)
 {
-
     T_DISPLAY_DATA   display_info;
 
-	dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtActivated,  TxtNull, COLOUR_STATUS);
-	dlg_initDisplayData_events( &display_info, NULL, THREE_SECS, KEY_HUP| KEY_LEFT );
+    dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtActivated,  TxtNull, COLOUR_STATUS);
+    dlg_initDisplayData_events( &display_info, NULL, THREE_SECS, KEY_HUP| KEY_LEFT );
 
-	info_dialog ( NULL, &display_info);
+    info_dialog ( NULL, &display_info);
 }
 
 static void showClear (void)
 {
-
     T_DISPLAY_DATA   display_info;
 
-	dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDeActivated,  TxtNull, COLOUR_STATUS);
-	dlg_initDisplayData_events( &display_info, NULL, THREE_SECS, KEY_HUP| KEY_LEFT );
+    dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDeActivated,  TxtNull, COLOUR_STATUS);
+    dlg_initDisplayData_events( &display_info, NULL, THREE_SECS, KEY_HUP| KEY_LEFT );
 
-	info_dialog ( NULL, &display_info);
+    info_dialog ( NULL, &display_info);
 }
 
 //    MENU_ITEM ( TxtCheckStatus,   servicesDivertCheck,     item_flag_none ),
@@ -1347,6 +1311,7 @@
 	else
 		showClear();
 }
+
 void settingsShowStateAutoAnswer (void)
 {
 	if (settingsGetStatus(SettingsAutoAnswerOn))
@@ -1354,6 +1319,7 @@
 	else
 		showClear();
 }
+
 void settingsShowStateAutoRedial(void)
 {
 	if (FFS_flashData.redial_mode == CM_REDIAL_AUTO)
@@ -1361,6 +1327,7 @@
 	else
 		showClear();
 }
+
 /*GW SPR#2470 Created*/
 void settingsShowStateCBDisable(void)
 {
@@ -1401,17 +1368,16 @@
  $Function:    	settingsFocusCurSelAutoAns
 
  $Description:	This function sets the focus to the On or Off menu item of the
- 			'Auto Answer' menu in the Phone Settings main menu.
- 			Check whether the 'Auto Answer' is enabled by reading the data
- 			stored in the FFS. Depending on that, set the focus to the menu
- 			item.
+		'Auto Answer' menu in the Phone Settings main menu.
+ 		Check whether the 'Auto Answer' is enabled by reading the data
+ 		stored in the FFS. Depending on that, set the focus to the menu
+ 		item.
 
  $Returns:	void
 
  $Arguments:	void
  *******************************************************************************/
 
-
 void settingsFocusCurSelAutoAns(void)
 {
 	// Points to the index of the menuitem to be selected
@@ -1438,7 +1404,6 @@
 	// Send the event to display the menu item and appropriate menuitem
 	// selected.
 	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);
-
 }
 
 // Jul 22,2004 CRR:20896 xrashmic - SASKEN
@@ -1459,10 +1424,10 @@
 /*******************************************************************************
  $Function:    	settingsFocusCurSelAnyKeyAns
  $Description:	This function sets the focus to the On or Off menu item of the
- 			'AnyKey Answer' menu in the Phone Settings main menu.
- 			Check whether the 'Any Key Answer' is enabled by reading the data
- 			stored in the FFS. Depending on that, set the focus to the menu
- 			item
+		'AnyKey Answer' menu in the Phone Settings main menu.
+ 		Check whether the 'Any Key Answer' is enabled by reading the data
+ 		stored in the FFS. Depending on that, set the focus to the menu
+ 		item
  $Returns:	void
  $Arguments:	void
  *******************************************************************************/
@@ -1494,14 +1459,13 @@
 	// Send the event to display the menu items and set focus to appropriate
 	// menuitem.
 	SEND_EVENT(setting_win, DEFAULT_OPTION, NULL, &menuItemIndex);
-
 }
 
 // May 04, 2005 REF: CRR 30285 x0021334
 /*******************************************************************************
  $Function:    	settingsSmsStatusReportCurSel
  $Description:	This function sets the focus to the On or Off menu item of the
- 			'Status Report' submenu menu in the Messages Settings menu.
+		'Status Report' submenu menu in the Messages Settings menu.
  $Returns:	void
  $Arguments:	void
  *******************************************************************************/
@@ -1521,7 +1485,4 @@
 	{
 		TRACE_FUNCTION("sms info could not be retrieved ");
 	}
-
-
 }
-