equal
deleted
inserted
replaced
103 |
103 |
104 // Destructor |
104 // Destructor |
105 CCCHConnMonHandler::~CCCHConnMonHandler() |
105 CCCHConnMonHandler::~CCCHConnMonHandler() |
106 { |
106 { |
107 CCHLOGSTRING( "CCCHConnMonHandler::~CCCHConnMonHandler" ); |
107 CCHLOGSTRING( "CCCHConnMonHandler::~CCCHConnMonHandler" ); |
108 iConnChangeListenerTimer->Cancel(); |
108 if ( iConnChangeListenerTimer ) |
|
109 { |
|
110 iConnChangeListenerTimer->Cancel(); |
|
111 } |
109 delete iConnChangeListenerTimer; |
112 delete iConnChangeListenerTimer; |
110 StopNotify(); |
113 StopNotify(); |
111 Cancel(); |
114 Cancel(); |
112 iPendingRequests.Close(); |
115 iPendingRequests.Close(); |
113 iUnsolvedConnIds.Close(); |
116 iUnsolvedConnIds.Close(); |
114 iConnIapIds.Close(); |
117 iConnIapIds.Close(); |
115 iAvailableSNAPs.Close(); |
118 iAvailableSNAPs.Close(); |
116 iAvailableIAPs.Close(); |
119 iAvailableIAPs.Close(); |
117 iConnMon.Close(); |
120 iConnMon.Close(); |
118 } |
121 } |
175 // |
178 // |
176 void CCCHConnMonHandler::SetSNAPsAvailabilityChangeListener( |
179 void CCCHConnMonHandler::SetSNAPsAvailabilityChangeListener( |
177 MCCHConnMonHandlerNotifier* aObserver ) |
180 MCCHConnMonHandlerNotifier* aObserver ) |
178 { |
181 { |
179 CCHLOGSTRING( "CCCHConnMonHandler::SetSNAPsAvailabilityChangeListener" ); |
182 CCHLOGSTRING( "CCCHConnMonHandler::SetSNAPsAvailabilityChangeListener" ); |
|
183 iConnChangeListenerTimer->Cancel(); |
180 iSNAPsAvailabilityObserver = aObserver; |
184 iSNAPsAvailabilityObserver = aObserver; |
181 if ( iSNAPsAvailabilityObserver ) |
185 if ( iSNAPsAvailabilityObserver ) |
182 { |
186 { |
183 iConnChangeListenerTimer->Start( |
187 iConnChangeListenerTimer->Start( |
184 KPeriodicTimerInterval, |
188 KPeriodicTimerInterval, |
562 iSNAPbuf(), KErrCancel ); |
566 iSNAPbuf(), KErrCancel ); |
563 iNetworkScanningObserver = NULL; |
567 iNetworkScanningObserver = NULL; |
564 } |
568 } |
565 if ( iSNAPsAvailabilityObserver ) |
569 if ( iSNAPsAvailabilityObserver ) |
566 { |
570 { |
|
571 iConnChangeListenerTimer->Cancel(); |
567 iSNAPsAvailabilityObserver->SNAPsAvailabilityChanged( KErrCancel ); |
572 iSNAPsAvailabilityObserver->SNAPsAvailabilityChanged( KErrCancel ); |
568 iSNAPsAvailabilityObserver = NULL; |
573 iSNAPsAvailabilityObserver = NULL; |
569 } |
574 } |
570 } |
575 } |
571 |
576 |