equal
deleted
inserted
replaced
959 // identifier itself is not enough to identify the node. |
959 // identifier itself is not enough to identify the node. |
960 node.NodeMetaDataL().IconL().SetIconDataReady( EFalse ); |
960 node.NodeMetaDataL().IconL().SetIconDataReady( EFalse ); |
961 } |
961 } |
962 } |
962 } |
963 } |
963 } |
964 else if ( parentIdentifier ) |
964 |
965 { |
|
966 CleanupStack::PopAndDestroy( parentIdentifier ); |
|
967 } |
|
968 |
|
969 // Delete data because ownership has been transferred. |
965 // Delete data because ownership has been transferred. |
970 CleanupStack::PopAndDestroy( aData ); |
966 CleanupStack::PopAndDestroy( aData ); |
971 |
967 |
972 RunOperation(); |
968 RunOperation(); |
973 DLTRACEOUT(("")); |
969 DLTRACEOUT(("")); |
1259 MapIconIdForDataBlockL(iconId, dataBlockId, |
1255 MapIconIdForDataBlockL(iconId, dataBlockId, |
1260 node.NodeMetaDataL().Identifier() ); |
1256 node.NodeMetaDataL().Identifier() ); |
1261 node.NodeMetaDataL().IconL().SetIconDataReady( EFalse ); |
1257 node.NodeMetaDataL().IconL().SetIconDataReady( EFalse ); |
1262 } |
1258 } |
1263 } |
1259 } |
1264 } |
|
1265 else if ( parentIdentifier ) |
|
1266 { |
|
1267 CleanupStack::PopAndDestroy( parentIdentifier ); |
|
1268 } |
1260 } |
1269 |
1261 |
1270 // Delete data because ownership has been transferred. |
1262 // Delete data because ownership has been transferred. |
1271 CleanupStack::PopAndDestroy( aData ); |
1263 CleanupStack::PopAndDestroy( aData ); |
1272 |
1264 |