comparison src/ui/bmi/mmiSmsMenu.c @ 92:c0052fe355d3

src/ui/bmi/*.[ch]: rm trailing white space
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 08 Nov 2020 06:39:16 +0000
parents 67bfe9f274f6
children 44d6af34c75a
comparison
equal deleted inserted replaced
91:c3d28a37caad 92:c0052fe355d3
31 Feb 28, 2007 OMAPS00109953 a0393213(R.Prabakar) 31 Feb 28, 2007 OMAPS00109953 a0393213(R.Prabakar)
32 Description : Need to be able to store SMS in SIM/ME 32 Description : Need to be able to store SMS in SIM/ME
33 Solution : Earlier, index alone was sufficient to identify messages. Now memory should also be taken care of. 33 Solution : Earlier, index alone was sufficient to identify messages. Now memory should also be taken care of.
34 34
35 May 27, 2005 MMI-FIX-29869 x0018858 35 May 27, 2005 MMI-FIX-29869 x0018858
36 Description: There is a limitation on the number of messages that can be downloaded from 36 Description: There is a limitation on the number of messages that can be downloaded from
37 server even though there is space on the sim. 37 server even though there is space on the sim.
38 Solution: The limitation has been removed and the number of messages that can be dowloaded 38 Solution: The limitation has been removed and the number of messages that can be dowloaded
39 has been modified to the masimum number that can be stored. 39 has been modified to the masimum number that can be stored.
40 40
41 March 31, 2005 REF: CRR MMI-SPR-24511 x0012852 41 March 31, 2005 REF: CRR MMI-SPR-24511 x0012852
42 Bug:The phone crashes when the user selects the 'Delete All' option 42 Bug:The phone crashes when the user selects the 'Delete All' option
43 almost the same time as there's an incoming message. 43 almost the same time as there's an incoming message.
44 Fix:Check added for part message before deleting all messages. 44 Fix:Check added for part message before deleting all messages.
45 45
46 Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar 46 Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar
47 Description: The phone resets when user presses the ''End All' key while the SMSs are being deleted. 47 Description: The phone resets when user presses the ''End All' key while the SMSs are being deleted.
48 Solution: As the user has already confirmed that all SMS messages are to be deleted, ''End All' key 48 Solution: As the user has already confirmed that all SMS messages are to be deleted, ''End All' key
49 press is ignored till the delete operation is over. 49 press is ignored till the delete operation is over.
50 50
51 Jul 13, 2004 REF: CRR 21615 Deepa M.D 51 Jul 13, 2004 REF: CRR 21615 Deepa M.D
52 Bug:Message once entered into message editor not storing in memory. 52 Bug:Message once entered into message editor not storing in memory.
53 Fix:When a SMS is typed in the Editor, it is stored in a temporary buffer. 53 Fix:When a SMS is typed in the Editor, it is stored in a temporary buffer.
54 When the user accesses the editor,the temporary buffer is copied back into 54 When the user accesses the editor,the temporary buffer is copied back into
55 the Editor . 55 the Editor .
56 56
57 Mar 29, 2004 REF: CRR 12722 Deepa M.D 57 Mar 29, 2004 REF: CRR 12722 Deepa M.D
58 Mar 24, 2004 REF: CRR 15746 Deepa M.D 58 Mar 24, 2004 REF: CRR 15746 Deepa M.D
59 25/10/00 Original Condat(UK) BMI version. 59 25/10/00 Original Condat(UK) BMI version.
60 60
61 $End 61 $End
62 62
63 63
324 324
325 // State of the SMS menu management 325 // State of the SMS menu management
326 T_SmsMenu_state g_SmsMenu_state = SMS_DISPLAY; 326 T_SmsMenu_state g_SmsMenu_state = SMS_DISPLAY;
327 MfwHnd g_ChildWindow2; 327 MfwHnd g_ChildWindow2;
328 UBYTE g_CenterNumber[NUMBER_LENGTH]; 328 UBYTE g_CenterNumber[NUMBER_LENGTH];
329 //Jul 13, 2004 REF: CRR 21615 Deepa M.D 329 //Jul 13, 2004 REF: CRR 21615 Deepa M.D
330 UBYTE TempTextBuffer[MAX_MSG_LEN_ARRAY]; //Temporary buffer to store the SMS content 330 UBYTE TempTextBuffer[MAX_MSG_LEN_ARRAY]; //Temporary buffer to store the SMS content
331 331
332 /******************************************************************************* 332 /*******************************************************************************
333 333
334 $Function: M_exeSendNew 334 $Function: M_exeSendNew
345 345
346 int M_exeSendNew(MfwMnu* m, MfwMnuItem* i) 346 int M_exeSendNew(MfwMnu* m, MfwMnuItem* i)
347 { 347 {
348 T_MFW_HND win = eZiTextWin;// SUMIT: mfwParent(mfw_header()); 348 T_MFW_HND win = eZiTextWin;// SUMIT: mfwParent(mfw_header());
349 T_SmsUserData SmsData; 349 T_SmsUserData SmsData;
350 350
351 /* Copy the number and name information to the SMS buffer 351 /* Copy the number and name information to the SMS buffer
352 */ 352 */
353 /*MC SPR 1257, clear whole buffer in case of Unicode entry*/ 353 /*MC SPR 1257, clear whole buffer in case of Unicode entry*/
354 354
355 /*SPR 2587, check that SMS has been initialised*/ 355 /*SPR 2587, check that SMS has been initialised*/
356 if (!smsidle_get_ready_state() || phb_get_mode() == PHB_LOADING) 356 if (!smsidle_get_ready_state() || phb_get_mode() == PHB_LOADING)
357 { 357 {
358 358
359 mmi_dialog_information_screen(0, TxtPleaseWait, NULL, NULL, NULL); 359 mmi_dialog_information_screen(0, TxtPleaseWait, NULL, NULL, NULL);
360 return 0; 360 return 0;
361 } 361 }
362 // Jul 13, 2004 REF: CRR 21615 Deepa M.D 362 // Jul 13, 2004 REF: CRR 21615 Deepa M.D
363 // Copy the content from the temporary buffer into the editor,so that the 363 // Copy the content from the temporary buffer into the editor,so that the
364 // previously typed content is retained. 364 // previously typed content is retained.
365 #ifdef TI_PS_FF_CONC_SMS 365 #ifdef TI_PS_FF_CONC_SMS
366 if(FFS_flashData.ConcatenateStatus == TRUE) 366 if(FFS_flashData.ConcatenateStatus == TRUE)
367 { 367 {
368 memset(SmsData.TextBuffer, '\0', MAX_MSG_LEN); 368 memset(SmsData.TextBuffer, '\0', MAX_MSG_LEN);
369 memcpy(SmsData.TextBuffer, TempTextBuffer,MAX_MSG_LEN); 369 memcpy(SmsData.TextBuffer, TempTextBuffer,MAX_MSG_LEN);
370 } 370 }
371 371
372 else 372 else
373 #endif /*TI_PS_FF_CONC_SMS*/ 373 #endif /*TI_PS_FF_CONC_SMS*/
374 { 374 {
375 memset(SmsData.TextBuffer, '\0', MAX_MSG_LEN_SGL); 375 memset(SmsData.TextBuffer, '\0', MAX_MSG_LEN_SGL);
376 //Copy only 160 characters ofthe message. 376 //Copy only 160 characters ofthe message.
377 memcpy(SmsData.TextBuffer, TempTextBuffer,MAX_MSG_LEN_SGL-1); 377 memcpy(SmsData.TextBuffer, TempTextBuffer,MAX_MSG_LEN_SGL-1);
378 } 378 }
379 379
380 SmsData.NumberBuffer[0]='\0'; //set the number to null. 380 SmsData.NumberBuffer[0]='\0'; //set the number to null.
381 SmsData.called_from_reply_item = FALSE; 381 SmsData.called_from_reply_item = FALSE;
382 382
383 SmsSend_SEND_start(win, (void *) &SmsData); 383 SmsSend_SEND_start(win, (void *) &SmsData);
384 return 1; 384 return 1;
385 } 385 }
386 386
387 /******************************************************************************* 387 /*******************************************************************************
631 * Create window handler 631 * Create window handler
632 */ 632 */
633 633
634 data->win = 634 data->win =
635 win_create (parent_window, 0, E_WIN_VISIBLE, (T_MFW_CB)M_SND_SAV_win_cb); 635 win_create (parent_window, 0, E_WIN_VISIBLE, (T_MFW_CB)M_SND_SAV_win_cb);
636 636
637 if (data->win EQ NULL) 637 if (data->win EQ NULL)
638 { 638 {
639 return NULL; 639 return NULL;
640 } 640 }
641 /* 641 /*
729 case E_INIT: 729 case E_INIT:
730 /* initialization of administrative data */ 730 /* initialization of administrative data */
731 data->id = value; 731 data->id = value;
732 data->user_data = (T_SmsUserData *)ALLOC_MEMORY (sizeof (T_SmsUserData)); 732 data->user_data = (T_SmsUserData *)ALLOC_MEMORY (sizeof (T_SmsUserData));
733 /*MC SPR 1257, clear whole buffer in case of Unicode entry*/ 733 /*MC SPR 1257, clear whole buffer in case of Unicode entry*/
734 #ifdef TI_PS_FF_CONC_SMS 734 #ifdef TI_PS_FF_CONC_SMS
735 if(FFS_flashData.ConcatenateStatus == TRUE) 735 if(FFS_flashData.ConcatenateStatus == TRUE)
736 memset( data->user_data->TextBuffer, '\0', MAX_MSG_LEN_SGL); 736 memset( data->user_data->TextBuffer, '\0', MAX_MSG_LEN_SGL);
737 else 737 else
738 #endif /*TI_PS_FF_CONC_SMS*/ 738 #endif /*TI_PS_FF_CONC_SMS*/
739 memset( data->user_data->TextBuffer, '\0', MAX_MSG_LEN); 739 memset( data->user_data->TextBuffer, '\0', MAX_MSG_LEN);
740 data->user_data->NumberBuffer[0] = '\0'; 740 data->user_data->NumberBuffer[0] = '\0';
741 741
742 /* initialization of the dialog data */ 742 /* initialization of the dialog data */
743 743
983 { 983 {
984 T_MFW_WIN * win_data; 984 T_MFW_WIN * win_data;
985 T_M_DEL_ALL * data; 985 T_M_DEL_ALL * data;
986 986
987 TRACE_FUNCTION ("M_DEL_ALL_destroy()"); 987 TRACE_FUNCTION ("M_DEL_ALL_destroy()");
988 988
989 if (own_window) 989 if (own_window)
990 { 990 {
991 win_data = ((T_MFW_HDR *)own_window)->data; 991 win_data = ((T_MFW_HDR *)own_window)->data;
992 data = (T_M_DEL_ALL *)win_data->user; 992 data = (T_M_DEL_ALL *)win_data->user;
993 993
1040 T_MFW_EVENT MfwEvents; 1040 T_MFW_EVENT MfwEvents;
1041 1041
1042 T_DISPLAY_DATA DisplayInfo; 1042 T_DISPLAY_DATA DisplayInfo;
1043 1043
1044 TRACE_FUNCTION ("M_DEL_ALL_exec_cb()"); 1044 TRACE_FUNCTION ("M_DEL_ALL_exec_cb()");
1045 1045
1046 switch (event) 1046 switch (event)
1047 { 1047 {
1048 case E_INIT: 1048 case E_INIT:
1049 /* initialization of administrative data */ 1049 /* initialization of administrative data */
1050 data->id = value; 1050 data->id = value;
1074 } 1074 }
1075 else 1075 else
1076 { /*SPR 2139, only create an SMS event handler if sms initialised and sms list is not empty*/ 1076 { /*SPR 2139, only create an SMS event handler if sms initialised and sms list is not empty*/
1077 MfwEvents = E_SMS_MO_AVAIL | E_SMS_ERR | E_SMS_OK; 1077 MfwEvents = E_SMS_MO_AVAIL | E_SMS_ERR | E_SMS_OK;
1078 data->sms_hnd = sms_create(data->win,MfwEvents,(MfwCb)M_DEL_ALL_mfw_cb); 1078 data->sms_hnd = sms_create(data->win,MfwEvents,(MfwCb)M_DEL_ALL_mfw_cb);
1079 1079
1080 DisplayInfo.TextId = TxtOkToDelete; 1080 DisplayInfo.TextId = TxtOkToDelete;
1081 DisplayInfo.Time = FIVE_SECS; 1081 DisplayInfo.Time = FIVE_SECS;
1082 DisplayInfo.KeyEvents = KEY_RIGHT|KEY_LEFT|KEY_CLEAR; 1082 DisplayInfo.KeyEvents = KEY_RIGHT|KEY_LEFT|KEY_CLEAR;
1083 DisplayInfo.Identifier = SMSMENU_ID_DELETEALL; 1083 DisplayInfo.Identifier = SMSMENU_ID_DELETEALL;
1084 DisplayInfo.LeftSoftKey = TxtSoftOK; 1084 DisplayInfo.LeftSoftKey = TxtSoftOK;
1190 /*a0393213 OMAPS00109953 - memory passed as parameter*/ 1190 /*a0393213 OMAPS00109953 - memory passed as parameter*/
1191 sms_msg_delete(data->g_SmsMenu_messages[g_ListLength2].index,data->g_SmsMenu_messages[g_ListLength2].mem); 1191 sms_msg_delete(data->g_SmsMenu_messages[g_ListLength2].index,data->g_SmsMenu_messages[g_ListLength2].mem);
1192 } 1192 }
1193 else 1193 else
1194 { 1194 {
1195 1195
1196 /* there is now anymore sms to delete !! */ 1196 /* there is now anymore sms to delete !! */
1197 g_SmsMenu_state = SMS_READY; 1197 g_SmsMenu_state = SMS_READY;
1198 1198
1199 /* cq16875 Destroy the previous info dialog if there is one before displaying the new dialog. 1199 /* cq16875 Destroy the previous info dialog if there is one before displaying the new dialog.
1200 When a concatenated message is deleted using the "Delete All" menu option the E_SMS_OK 1200 When a concatenated message is deleted using the "Delete All" menu option the E_SMS_OK
1201 event is received for each Concat message part that is deleted. 1201 event is received for each Concat message part that is deleted.
1202 12-02-04 MZ. */ 1202 12-02-04 MZ. */
1203 if(data->child_dialog != NULL) 1203 if(data->child_dialog != NULL)
1204 { 1204 {
1205 SEND_EVENT (data->child_dialog, DIALOG_DESTROY, 0,NULL); 1205 SEND_EVENT (data->child_dialog, DIALOG_DESTROY, 0,NULL);
1206 data->child_dialog = NULL; 1206 data->child_dialog = NULL;
1207 } 1207 }
1208 1208
1209 SmsMenu_loadDialogDefault(&DisplayInfo); 1209 SmsMenu_loadDialogDefault(&DisplayInfo);
1382 { 1382 {
1383 /* initialization of administrative data */ 1383 /* initialization of administrative data */
1384 data->id = value; 1384 data->id = value;
1385 1385
1386 /* SPR#1428 - SH - New Editor changes */ 1386 /* SPR#1428 - SH - New Editor changes */
1387 1387
1388 #ifdef NEW_EDITOR 1388 #ifdef NEW_EDITOR
1389 AUI_edit_SetDefault(&editor_data); 1389 AUI_edit_SetDefault(&editor_data);
1390 AUI_edit_SetDisplay(&editor_data, ZONE_FULL_SK_TITLE, COLOUR_EDITOR_XX, EDITOR_FONT); 1390 AUI_edit_SetDisplay(&editor_data, ZONE_FULL_SK_TITLE, COLOUR_EDITOR_XX, EDITOR_FONT);
1391 AUI_edit_SetEvents(&editor_data, value, TRUE, FOREVER, (T_AUI_EDIT_CB)SmsMenu_StandardEditor_cb); 1391 AUI_edit_SetEvents(&editor_data, value, TRUE, FOREVER, (T_AUI_EDIT_CB)SmsMenu_StandardEditor_cb);
1392 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtDelete, TxtVoiceMail, NULL); /* SPR#2141 - DS - Changed RSK to "Delete". */ 1392 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtDelete, TxtVoiceMail, NULL); /* SPR#2141 - DS - Changed RSK to "Delete". */
1393 // Change by Sasken ( Deepa M.d) on March 29th 2004 1393 // Change by Sasken ( Deepa M.d) on March 29th 2004
1394 // Issue Number : MMI-SPR-12722 1394 // Issue Number : MMI-SPR-12722
1395 // Subject: Right softkey should be "Back" when the editor is empty 1395 // Subject: Right softkey should be "Back" when the editor is empty
1396 // Bug : Right softkey should be "Back" when the editor is empty 1396 // Bug : Right softkey should be "Back" when the editor is empty
1397 // Solution : Added alternative string for the right softkey tobe displayed when the editor is empty 1397 // Solution : Added alternative string for the right softkey tobe displayed when the editor is empty
1398 1398
1399 AUI_edit_SetAltTextStr(&editor_data, 0, NULL, TRUE, TxtSoftBack); 1399 AUI_edit_SetAltTextStr(&editor_data, 0, NULL, TRUE, TxtSoftBack);
1400 AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE); 1400 AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE);
1401 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)FFS_flashData.voice_mail, PHB_MAX_LEN); 1401 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)FFS_flashData.voice_mail, PHB_MAX_LEN);
1402 1402
1403 /* SPR#2141 - DS - Set RSK to "Back" when the editor is empty. */ 1403 /* SPR#2141 - DS - Set RSK to "Back" when the editor is empty. */
1404 AUI_edit_SetAltTextStr(&editor_data, 1, NULL, TRUE, TxtSoftBack); 1404 AUI_edit_SetAltTextStr(&editor_data, 1, NULL, TRUE, TxtSoftBack);
1405 1405
1406 AUI_edit_Start(win, &editor_data); 1406 AUI_edit_Start(win, &editor_data);
1407 #else /* NEW_EDITOR */ 1407 #else /* NEW_EDITOR */
1408 SmsMenu_loadEditDefault(&editor_data); 1408 SmsMenu_loadEditDefault(&editor_data);
1409 1409
1410 editor_data.editor_attr.text = (char *)FFS_flashData.voice_mail; 1410 editor_data.editor_attr.text = (char *)FFS_flashData.voice_mail;
1414 // Change by Sasken ( Deepa M.d) on March 29th 2004 1414 // Change by Sasken ( Deepa M.d) on March 29th 2004
1415 // Issue Number : MMI-SPR-12722 1415 // Issue Number : MMI-SPR-12722
1416 // Subject: Right softkey should be "Back" when the editor is empty 1416 // Subject: Right softkey should be "Back" when the editor is empty
1417 // Bug : Right softkey should be "Back" when the editor is empty 1417 // Bug : Right softkey should be "Back" when the editor is empty
1418 // Solution : Added alternative string for the right softkey tobe displayed when the editor is empty 1418 // Solution : Added alternative string for the right softkey tobe displayed when the editor is empty
1419 1419
1420 editor_data.RightSoftKey = TxtSoftBack; 1420 editor_data.RightSoftKey = TxtSoftBack;
1421 editor_data.Identifier = value; 1421 editor_data.Identifier = value;
1422 1422
1423 editor_start(win,&editor_data); /* start the editor */ 1423 editor_start(win,&editor_data); /* start the editor */
1424 #endif /* NEW_EDITOR */ 1424 #endif /* NEW_EDITOR */
1635 TRACE_FUNCTION("SmsMenu_sms_delete_all()"); 1635 TRACE_FUNCTION("SmsMenu_sms_delete_all()");
1636 //May 27, 2005 MMI-FIX-29869 x0018858 1636 //May 27, 2005 MMI-FIX-29869 x0018858
1637 #ifdef FF_MMI_SMS_DYNAMIC 1637 #ifdef FF_MMI_SMS_DYNAMIC
1638 data->g_SmsMenu_messages = (T_MFW_SMS_MSG*)ALLOC_MEMORY (g_max_messages * sizeof(T_MFW_SMS_MSG) ); 1638 data->g_SmsMenu_messages = (T_MFW_SMS_MSG*)ALLOC_MEMORY (g_max_messages * sizeof(T_MFW_SMS_MSG) );
1639 g_ListLength2 = sms_message_list(MFW_SMS_ALL, data->g_SmsMenu_messages, g_max_messages); 1639 g_ListLength2 = sms_message_list(MFW_SMS_ALL, data->g_SmsMenu_messages, g_max_messages);
1640 #else 1640 #else
1641 g_ListLength2 = sms_message_list(MFW_SMS_ALL, data->g_SmsMenu_messages, MAX_MESSAGES); 1641 g_ListLength2 = sms_message_list(MFW_SMS_ALL, data->g_SmsMenu_messages, MAX_MESSAGES);
1642 #endif 1642 #endif
1643 //NM 22.8 msgsLoadInfoDefaults2(&DisplayInfo); 1643 //NM 22.8 msgsLoadInfoDefaults2(&DisplayInfo);
1644 1644
1645 1645
1646 if (g_ListLength2 > 0) 1646 if (g_ListLength2 > 0)
1647 { 1647 {
1648 /* Display "Please wait" on the screen*/ 1648 /* Display "Please wait" on the screen*/
1649 /* it is start now to delete sms*/ 1649 /* it is start now to delete sms*/
1650 /* SPR 2139, Removed call to dialog handler, as not needed*/ 1650 /* SPR 2139, Removed call to dialog handler, as not needed*/
1651 1651
1652 // Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar 1652 // Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar
1653 // As the user has already confirmed that all SMS messages are to be deleted, ''End All' key 1653 // As the user has already confirmed that all SMS messages are to be deleted, ''End All' key
1654 // press is to be ignored. Call function mmi_dialog_information_screen_delete_all() instead of 1654 // press is to be ignored. Call function mmi_dialog_information_screen_delete_all() instead of
1655 // mmi_dialog_information_screen_forever(). 1655 // mmi_dialog_information_screen_forever().
1656 1656
1657 // data->waiting_win = mmi_dialog_information_screen_forever(win,TxtPleaseWait, NULL, COLOUR_STATUS_WAIT); 1657 // data->waiting_win = mmi_dialog_information_screen_forever(win,TxtPleaseWait, NULL, COLOUR_STATUS_WAIT);
1658 1658
1659 data->waiting_win = mmi_dialog_information_screen_delete_all(win,TxtPleaseWait, NULL, COLOUR_STATUS_WAIT); 1659 data->waiting_win = mmi_dialog_information_screen_delete_all(win,TxtPleaseWait, NULL, COLOUR_STATUS_WAIT);
1660 1660
1661 /* delete now the first sms and than wait */ 1661 /* delete now the first sms and than wait */
1662 /* for the MFW EVENT "E_SMS_OK" */ 1662 /* for the MFW EVENT "E_SMS_OK" */
1663 1663
1664 g_ListLength2 --; 1664 g_ListLength2 --;
1665 /*a0393213 OMAPS00109953 - memory passed as parameter*/ 1665 /*a0393213 OMAPS00109953 - memory passed as parameter*/
1666 sms_msg_delete(data->g_SmsMenu_messages[g_ListLength2].index,data->g_SmsMenu_messages[g_ListLength2].mem); 1666 sms_msg_delete(data->g_SmsMenu_messages[g_ListLength2].index,data->g_SmsMenu_messages[g_ListLength2].mem);
1667 } 1667 }
1668 //May 27, 2005 MMI-FIX-29869 x0018858 1668 //May 27, 2005 MMI-FIX-29869 x0018858
1669 #ifdef FF_MMI_SMS_DYNAMIC 1669 #ifdef FF_MMI_SMS_DYNAMIC
1670 if (g_ListLength2 == 0) 1670 if (g_ListLength2 == 0)
1671 FREE_MEMORY((U8*)data->g_SmsMenu_messages, g_max_messages * sizeof(T_MFW_SMS_MSG)); 1671 FREE_MEMORY((U8*)data->g_SmsMenu_messages, g_max_messages * sizeof(T_MFW_SMS_MSG));
1672 #endif 1672 #endif
1673 /*SPR 2139, don't need "else" as empty list case handled earlier*/ 1673 /*SPR 2139, don't need "else" as empty list case handled earlier*/
1674 return 1; 1674 return 1;
1675 1675
1676 } 1676 }
1677 1677
1706 // Convert BCD number into string 1706 // Convert BCD number into string
1707 cmhPHB_getAdrStr(international, PHB_MAX_LEN - 1, FFS_flashData.mbn_Num, FFS_flashData.mbn_len); 1707 cmhPHB_getAdrStr(international, PHB_MAX_LEN - 1, FFS_flashData.mbn_Num, FFS_flashData.mbn_len);
1708 1708
1709 // If the same number then we get the alpha identifier 1709 // If the same number then we get the alpha identifier
1710 cmhPHB_getMfwTagNt((UBYTE*)FFS_flashData.mbn_AlphId, 10, (UBYTE*)mail_alpha, &nlen); 1710 cmhPHB_getMfwTagNt((UBYTE*)FFS_flashData.mbn_AlphId, 10, (UBYTE*)mail_alpha, &nlen);
1711 1711
1712 mail_alpha[nlen] = '\0'; 1712 mail_alpha[nlen] = '\0';
1713 1713
1714 return TRUE; 1714 return TRUE;
1715 1715
1716 } 1716 }
1932 USHORT TextId2; 1932 USHORT TextId2;
1933 1933
1934 // change by Sasken on March 24th 2004 1934 // change by Sasken on March 24th 2004
1935 // Issue Number : SPR#15746 1935 // Issue Number : SPR#15746
1936 // TextId2 string changed to TxtActivated from TxtActivate 1936 // TextId2 string changed to TxtActivated from TxtActivate
1937 1937
1938 if (FFS_flashData.ConcatenateStatus == TRUE ) 1938 if (FFS_flashData.ConcatenateStatus == TRUE )
1939 TextId2 = TxtActivated; 1939 TextId2 = TxtActivated;
1940 else 1940 else
1941 TextId2 = TxtDeActivated; 1941 TextId2 = TxtDeActivated;
1942 1942