equal
deleted
inserted
replaced
301 else if ( ECloseConnectionQuery == iActiveNotifier ) |
301 else if ( ECloseConnectionQuery == iActiveNotifier ) |
302 { |
302 { |
303 iNotifier.CancelNotifier(KBTGenericQueryNotifierUid); |
303 iNotifier.CancelNotifier(KBTGenericQueryNotifierUid); |
304 } |
304 } |
305 else if ( EPowerModeChangeNote == iActiveNotifier ) |
305 else if ( EPowerModeChangeNote == iActiveNotifier ) |
306 { |
306 { |
307 iNotifier.CancelNotifier(KBTGenericQueryNotifierUid); |
307 iNotifier.CancelNotifier(KBTGenericInfoNotifierUid); |
308 } |
308 } |
309 |
309 |
310 // For all cancels, we must reset iActiveNotifier back to ENoneQuery |
310 // For all cancels, we must reset iActiveNotifier back to ENoneQuery |
311 // to permit another request to be made. |
311 // to permit another request to be made. |
312 iActiveNotifier = ENoneQuery; |
312 iActiveNotifier = ENoneQuery; |
313 |
313 |
328 // For all completes, we must reset iActiveNotifier back to ENoneQuery |
328 // For all completes, we must reset iActiveNotifier back to ENoneQuery |
329 // to permit another request to be made. |
329 // to permit another request to be made. |
330 switch (iActiveNotifier) |
330 switch (iActiveNotifier) |
331 { |
331 { |
332 case EPowerModeQuery: |
332 case EPowerModeQuery: |
333 iActiveNotifier = ENoneQuery; |
333 ShowNotification(ETrue); |
334 ShowNotification(ETrue); |
334 iActiveNotifier = EPowerModeChangeNote ; |
335 SetActive(); |
335 SetActive(); |
336 break; |
336 break; |
337 case ECloseConnectionQuery: |
337 case ECloseConnectionQuery: |
338 iActiveNotifier = ENoneQuery; |
338 iActiveNotifier = ENoneQuery; |
339 if (iConnQuery()) //user wants to stop existing connection |
339 if (iConnQuery()) //user wants to stop existing connection |