--- a/phoneapp/phoneuiutils/src/cphonepubsubproxy.cpp Tue Jun 15 14:14:38 2010 +0100
+++ b/phoneapp/phoneuiutils/src/cphonepubsubproxy.cpp Thu Jul 22 16:33:21 2010 +0100
@@ -170,7 +170,7 @@
{
__ASSERT_DEBUG( aObserver, Panic( EPhoneUtilsParameterNotInitialized ) );
__LOGMETHODSTARTEND(EPhoneUIUtils, "CPhonePubSubProxy::NotifyChangeL() ");
-
+
// make sure this a new item in iObserverArray
TBool requestIssued = EFalse;
TBool sameRequestIssuedByObserver = EFalse;
@@ -291,7 +291,7 @@
{
TInt count = iObserverArray->Count();
- // Remove the observer and its subscriptions
+ // Remove the observer
TBool observerRemoved = EFalse;
for( TInt i = count - 1; i >= 0 && !observerRemoved; i-- )
{
@@ -301,22 +301,6 @@
// Remove observer
observerRemoved = ETrue;
iObserverArray->Delete( i );
-
- // Remove this observers' subscriptions
- TInt pubSubCount = iPublishSubscriberArray->Count();
-
- for ( TInt j = pubSubCount - 1; j >= 0; j++ )
- {
- CPhonePublishSubscriberAO* publishSubscriber =
- iPublishSubscriberArray->At( j );
-
- if ( publishSubscriber->Category() == observerTag.iCategory &&
- publishSubscriber->Key() == observerTag.iKey )
- {
- iPublishSubscriberArray->Delete( i );
- delete publishSubscriber;
- }
- }
}
}
}