1.1 --- a/epoc32/include/mw/aiwgenericparam.hrh	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/aiwgenericparam.hrh	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 2003-2006 Nokia Corporation and/or its subsidiary(-ies).
     1.5  * All rights reserved.
     1.6  * This component and the accompanying materials are made available
     1.7 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +* under the terms of "Eclipse Public License v1.0"
     1.9  * which accompanies this distribution, and is available
    1.10 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  *
    1.13  * Initial Contributors:
    1.14  * Nokia Corporation - initial contribution.
    1.15 @@ -174,18 +174,19 @@
    1.16  <MCSS_5132_OFF_CYCLE_SW_INT>
    1.17  </branchInfo>*/
    1.18  // BRANCH 07-04-10 : juhuusit
    1.19 -#ifdef RD_VOIP_REL_2_2
    1.20      ,
    1.21      EGenericParamDialMenuServiceEntry   = 270,
    1.22      EGenericParamDialMenuServiceOptions = 271
    1.23 -#endif
    1.24  // BRANCH_END 07-04-10 : juhuusit
    1.25  
    1.26 +
    1.27  /*<branchInfo originator="gronoff" since="08-28-08" category="new_feature" error=”none”>
    1.28  <PF5250_OFF_CYCLE_SW_INT>
    1.29  </branchInfo>*/
    1.30  // BRANCH 08-28-08: gronoff
    1.31      ,
    1.32 +    EGenericParamCNAP									= 290,
    1.33 +    
    1.34      EGenericParamXSpId                  = 1919,
    1.35      EGenericParamFirstName              = 1920,
    1.36      EGenericParamLastName               = 1921,
    1.37 @@ -315,16 +316,17 @@
    1.38  <MCSS_5132_OFF_CYCLE_SW_INT>
    1.39  </branchInfo>*/
    1.40  // BRANCH 07-04-10 : juhuusit
    1.41 -#ifdef RD_VOIP_REL_2_2
    1.42  #define EGenericParamDialMenuServiceEntryStr            "270"
    1.43  #define EGenericParamDialMenuServiceOptionsStr          "271"
    1.44 -#endif // RD_VOIP_REL_2_2
    1.45  // BRANCH_END 07-04-10 : juhuusit
    1.46  
    1.47  /*<branchInfo originator="gronoff" since="08-28-08" category="new_feature" error=”none”>
    1.48  <PF5250_OFF_CYCLE_SW_INT>
    1.49  </branchInfo>*/
    1.50  // BRANCH 08-28-08: gronoff
    1.51 +
    1.52 +#define EGenericParamCNAPStr										"290"
    1.53 +
    1.54  #define EGenericParamXSpIdEntryStr              "1919"
    1.55  #define EGenericParamFirstNameEntryStr          "1920"
    1.56  #define EGenericParamLastNameEntryStr           "1921"