diff -r 7ec726f93df1 -r 489cf6208544 cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp --- a/cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp Fri May 14 16:15:46 2010 +0300 +++ b/cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp Thu May 27 13:17:01 2010 +0300 @@ -304,23 +304,25 @@ CleanupStack::PushL( plugin ); TBool inserted( EFalse ); - //TODO, Implement plugin sorting by priority later. - /* - TInt defaultPriority( KDataMobilitySelectionPolicyPriorityWildCard ); + + TInt defaultPriority( CMManager::KDataMobilitySelectionPolicyPriorityWildCard ); - // No UI priority -> wildcard - TRAP_IGNORE( defaultPriority = plugin->GetIntAttributeL( ECmDefaultUiPriority ) ); + // No priority -> wildcard + TRAP_IGNORE( defaultPriority = plugin->GetBearerInfoIntL( + CMManager::ECmDefaultPriority ) ); - for ( TInt j( 0 ); j < iPlugins->Count(); ++j ) + for ( TInt j = 0; j < iPlugins->Count(); j++ ) { - if ( defaultPriority > (*iPlugins)[j]->GetIntAttributeL( ECmDefaultUiPriority ) ) + TUint32 bearerToCompare = (*iPlugins)[j]->GetBearerInfoIntL( + CMManager::ECmDefaultPriority ); + if ( defaultPriority > bearerToCompare ) { continue; } - else if ( defaultPriority == (*iPlugins)[j]->GetIntAttributeL( ECmDefaultUiPriority ) ) + else if ( defaultPriority == bearerToCompare ) { - if ( plugin->GetIntAttributeL( ECmExtensionLevel ) > - (*iPlugins)[j]->GetIntAttributeL( ECmExtensionLevel ) ) + if ( plugin->GetBearerInfoIntL( ECmExtensionLevel ) > + (*iPlugins)[j]->GetBearerInfoIntL( ECmExtensionLevel ) ) { iPlugins->InsertL( j, plugin ); inserted = ETrue; @@ -333,7 +335,7 @@ inserted = ETrue; break; } - }*/ + } if ( !inserted ) {