equal
deleted
inserted
replaced
718 = iWindowManager.WidgetUIClientSession(); |
718 = iWindowManager.WidgetUIClientSession(); |
719 |
719 |
720 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowNetworkAccess ); |
720 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowNetworkAccess ); |
721 TInt networkAccess = *propValue; |
721 TInt networkAccess = *propValue; |
722 delete propValue; |
722 delete propValue; |
|
723 |
723 propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowFullAccess ); |
724 propValue = widgetRegistry.GetWidgetPropertyValueL(iUid, EAllowFullAccess ); |
724 TInt fullAccess = *propValue; |
725 TInt fullAccess = *propValue; |
725 delete propValue; |
726 delete propValue; |
726 |
727 |
727 if ( !( networkAccess || fullAccess ) ) |
728 if ( !( networkAccess || fullAccess ) ) |
842 if ( EBrowserCenRepApSelModeAlwaysAsk == ask ) |
843 if ( EBrowserCenRepApSelModeAlwaysAsk == ask ) |
843 { |
844 { |
844 //Always ask case |
845 //Always ask case |
845 TUint32 ap( 0 ); |
846 TUint32 ap( 0 ); |
846 iWindowManager.GetConnection()->SetRequestedAP( ap ); |
847 iWindowManager.GetConnection()->SetRequestedAP( ap ); |
|
848 #ifdef BRDO_OCC_ENABLED_FF |
|
849 TUint32 snapId = 0; //Defaults connects to Internet snap |
|
850 iWindowManager.GetConnection()->SetConnectionType(CMManager::EDestination); |
|
851 iWindowManager.GetConnection()->SetRequestedSnap(snapId); |
|
852 #endif |
847 } |
853 } |
848 } |
854 } |
849 } |
855 } |
850 |
856 |
851 // ----------------------------------------------------------------------------- |
857 // ----------------------------------------------------------------------------- |
1170 { |
1176 { |
1171 TNetworkState currNetState; |
1177 TNetworkState currNetState; |
1172 RWidgetRegistryClientSession& widgetRegistry = iWindowManager.WidgetUIClientSession(); |
1178 RWidgetRegistryClientSession& widgetRegistry = iWindowManager.WidgetUIClientSession(); |
1173 TInt inMiniView = !(WidgetMiniViewState()==EMiniViewEnabled || WidgetMiniViewState()==EMiniViewNotEnabled);//widgetRegistry.IsWidgetInMiniView( iUid); |
1179 TInt inMiniView = !(WidgetMiniViewState()==EMiniViewEnabled || WidgetMiniViewState()==EMiniViewNotEnabled);//widgetRegistry.IsWidgetInMiniView( iUid); |
1174 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL( iUid, EAllowNetworkAccess ); |
1180 CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL( iUid, EAllowNetworkAccess ); |
1175 TInt netAccessWdgtProp = *propValue; // AllowNetworkAccess in the info.plist file |
1181 TInt netAccessWdgtProp = propValue && *propValue; // AllowNetworkAccess in the info.plist file |
|
1182 delete propValue; |
1176 |
1183 |
1177 if ( netAccessWdgtProp && ((inMiniView && (iWindowManager.GetNetworkMode() == (TInt)EOnlineMode)) |
1184 if ( netAccessWdgtProp && ((inMiniView && (iWindowManager.GetNetworkMode() == (TInt)EOnlineMode)) |
1178 || (!inMiniView && iUserPermission)) ) |
1185 || (!inMiniView && iUserPermission)) ) |
1179 { |
1186 { |
1180 if ( iWindowManager.GetNetworkConn() ) |
1187 if ( iWindowManager.GetNetworkConn() ) |