equal
deleted
inserted
replaced
459 #endif |
459 #endif |
460 |
460 |
461 if ( !iDMAuthInfo ) |
461 if ( !iDMAuthInfo ) |
462 { |
462 { |
463 aMessage.Complete( KErrNotFound ); |
463 aMessage.Complete( KErrNotFound ); |
464 _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): iDMAuthInfo is NULL"); |
|
465 return; |
464 return; |
466 } |
465 } |
467 aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); |
466 aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); |
468 aMessage.Complete( KErrNone ); |
467 aMessage.Complete( KErrNone ); |
469 _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): end"); |
468 _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): end"); |
2234 |
2233 |
2235 default: |
2234 default: |
2236 break; |
2235 break; |
2237 }; |
2236 }; |
2238 |
2237 |
2239 |
2238 if ( buf ) |
2240 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2239 { |
2241 { |
2240 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2242 iProgressEventBuffer.Remove(0); |
2241 { |
2243 } |
2242 iProgressEventBuffer.Remove(0); |
2244 |
2243 } |
2245 delete buf; |
2244 |
2246 buf = NULL; |
2245 delete buf; |
2247 |
2246 buf = NULL; |
2248 |
2247 } |
2249 } |
2248 } |
2250 |
2249 |
2251 if ( !mutexError ) |
2250 if ( !mutexError ) |
2252 { |
2251 { |
2253 // Release mutex |
2252 // Release mutex |
2308 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2307 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2309 { |
2308 { |
2310 iProgressEventBuffer.Remove(0); |
2309 iProgressEventBuffer.Remove(0); |
2311 } |
2310 } |
2312 */ |
2311 */ |
2313 if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2312 if ( buf ) |
2314 { |
2313 { |
2315 iContactSuiteProgressEventBuffer.Remove(0); |
2314 if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2316 } |
2315 { |
2317 |
2316 iContactSuiteProgressEventBuffer.Remove(0); |
2318 delete buf; |
2317 } |
2319 buf = NULL; |
2318 |
2320 |
2319 delete buf; |
|
2320 buf = NULL; |
|
2321 } |
2321 |
2322 |
2322 } |
2323 } |
2323 |
2324 |
2324 if ( !mutexError ) |
2325 if ( !mutexError ) |
2325 { |
2326 { |