gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp
branchRCL_3
changeset 67 940cad2b4a51
parent 54 7e0eff37aedb
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp	Wed Sep 15 12:30:49 2010 +0300
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp	Wed Oct 13 14:51:53 2010 +0300
@@ -75,10 +75,7 @@
 _LIT( KGSNetWCDMAIcon, "0\t" );
 _LIT( KGSNetGSMIcon, "1\t" );
 _LIT( KEmptyStr, "" );
-/* Implementation of forbidden operator icon begins */
-_LIT( KGSNetNoIcon, "\t");
-_LIT( KGSNetForbiddenIcon, "2\t" );
-/* Implementation of forbidden operator icon ends */
+
 // Warning disabled as this constant is used inside __ASSERT_DEBUG
 #pragma diag_suppress 177
 _LIT( KGSNetworkPluginAssertName, "CGSNetworkPlugin" );
@@ -315,30 +312,23 @@
     TBool showGraphicalList =
         Container()->NetPluginModel()->GraphicalNetworkListSupportedL();
     __GSLOGSTRING1("[GS]    NetworkListL: showGraphicalList: %d", showGraphicalList);
-   
+
     //if no net items were found, do not show list
     if ( iNetworkArray->Count() > 0 )
         {
-        /** Implementation of forbidden operator icon begins */
-        // check if forbidden operator icon is supported
-        TBool forbiddenOperator = 
-                FeatureManager::FeatureSupported( KFeatureIdFfTdScdmaForbiddenoperatoricondisplay );
-        /** Implementation of forbidden operator icon ends */
         while ( !iApprovedNetwork )
             {
             AknPopupListEmpty<CEikFormattedCellListBox>* list;
-            /** Implementation of forbidden operator icon begins */
-            if (forbiddenOperator || showGraphicalList
-                    && FeatureManager::FeatureSupported(KFeatureIdProtocolWcdma))
+            if ( showGraphicalList &&
+                 FeatureManager::FeatureSupported( KFeatureIdProtocolWcdma ) )
                 {
-                list = new (ELeave) CAknSingleGraphicPopupMenuStyleListBox;
+                list = new ( ELeave ) CAknSingleGraphicPopupMenuStyleListBox;
                 }
             else
                 {
-                list = new (ELeave) CAknSinglePopupMenuStyleListBox;
+                list = new ( ELeave ) CAknSinglePopupMenuStyleListBox;
                 }
-            /** Implementation of forbidden operator icon ends */
-            
+
             CleanupStack::PushL( list );
             if ( iNetworkPopupList )
                 {
@@ -399,20 +389,8 @@
                     __GSLOGSTRING1("[GS]    NetworkListL: Network Longname: %S", insertString);
                     }
 
-                /** Implementation of forbidden operator icon begins */
                 //set icon for network
-                if ( forbiddenOperator )
-                    {
-                    if ( info.iStatus == MPsetNetworkSelect::ENetStatForbidden )
-                        {
-                        insertString->Des().Insert( 0, KGSNetForbiddenIcon );
-                        }
-                    else 
-                        {
-                        insertString->Des().Insert( 0, KGSNetNoIcon );
-                        }
-                    }
-                else if ( showGraphicalList )
+                if ( showGraphicalList )
                     {
                     if ( FeatureManager::FeatureSupported(
                                                   KFeatureIdProtocolWcdma ) )
@@ -428,7 +406,6 @@
                             }
                         }
                     }
-                /** Implementation of forbidden operator icon ends */
                 items->AppendL( *insertString );
                 CleanupStack::PopAndDestroy();
                 }
@@ -450,8 +427,7 @@
 
             // Setup graphic items list for dual mode nw selection listbox
             // based on the local variation
-            /** Implementation of forbidden operator icon begins */
-            if ( forbiddenOperator || showGraphicalList )
+            if ( showGraphicalList )
                 {
                 CAknIconArray* iconList = new (ELeave) CAknIconArray( 10 );
                 CleanupStack::PushL( iconList );
@@ -459,7 +435,7 @@
                 list->ItemDrawer()->ColumnData()->SetIconArray( iconList );
                 CleanupStack::Pop( iconList ); //listbox model now owns this
                 }
-            /** Implementation of forbidden operator icon ends */
+
             TInt res = 0;
             if( items->Count() )
                 {