equal
deleted
inserted
replaced
477 found = ETrue; |
477 found = ETrue; |
478 TUid aUid = TUid::Uid( *(iPropertyValues[EUid]) ); |
478 TUid aUid = TUid::Uid( *(iPropertyValues[EUid]) ); |
479 iWidgetInHS = iRegistry.IsWidgetInMiniView( aUid ); |
479 iWidgetInHS = iRegistry.IsWidgetInMiniView( aUid ); |
480 // get original install dir from registry in case user |
480 // get original install dir from registry in case user |
481 // decides to "overrite" to another memory location |
481 // decides to "overrite" to another memory location |
482 iOriginalDir = *( iRegistry.GetWidgetPropertyValueL( |
482 CWidgetPropertyValue *propValue = iRegistry.GetWidgetPropertyValueL( |
483 TUid::Uid( *(iPropertyValues[EUid]) ), |
483 TUid::Uid( *(iPropertyValues[EUid]) ), |
484 EBasePath ) ); |
484 EBasePath ); |
|
485 |
|
486 iOriginalDir.Zero(); |
|
487 if(propValue) |
|
488 iOriginalDir = *propValue; |
|
489 |
|
490 delete propValue; |
485 } |
491 } |
486 // uid for a new widget will be gotten once install location (c: or |
492 // uid for a new widget will be gotten once install location (c: or |
487 // e:) is selected |
493 // e:) is selected |
488 |
494 |
489 // see if main.html is in zip bundle |
495 // see if main.html is in zip bundle |
995 apaLsSession.Close(); |
1001 apaLsSession.Close(); |
996 } |
1002 } |
997 if ( !iSilent ) { iUIHandler->DisplayUninstallInProgressL(); } |
1003 if ( !iSilent ) { iUIHandler->DisplayUninstallInProgressL(); } |
998 TBuf<KWidgetRegistryVal> widgetPath; |
1004 TBuf<KWidgetRegistryVal> widgetPath; |
999 iRegistry.GetWidgetPath( aUid, widgetPath ); |
1005 iRegistry.GetWidgetPath( aUid, widgetPath ); |
1000 TBool aVendor = *(iRegistry.GetWidgetPropertyValueL(aUid, ENokiaWidget)); |
1006 |
1001 |
1007 CWidgetPropertyValue* propValue = iRegistry.GetWidgetPropertyValueL(aUid, ENokiaWidget); |
|
1008 TBool aVendor = propValue && *(propValue); |
|
1009 delete propValue; |
1002 |
1010 |
1003 // TODO if any of next steps leave does state become inconsistent? |
1011 // TODO if any of next steps leave does state become inconsistent? |
1004 |
1012 |
1005 // remove the dir for the widget |
1013 // remove the dir for the widget |
1006 // TODO why this validation? |
1014 // TODO why this validation? |