uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemPopup.cpp
branchRCL_3
changeset 55 aecbbf00d063
parent 23 3d340a0166ff
child 56 d48ab3b357f1
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemPopup.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemPopup.cpp	Tue Aug 31 15:28:30 2010 +0300
@@ -49,7 +49,7 @@
 #include <AknMediatorFacade.h>
 #include <aknSDData.h>
 
-#include <secondarydisplay/AknSecondaryDisplayDefs.h>
+#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
 #include <AknsUtils.h>
 #include <aknglobalpopupprioritycontroller.h>
 #include "GlobalWindowPriorities.h"
@@ -766,13 +766,12 @@
 
 void CAknGlobalNoteDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
     {
-    if (aPointerEvent.iType == TPointerEvent::EButton1Down)
+    if(aPointerEvent.iType == TPointerEvent::EButton1Down)
         {
         iCaptured = ETrue;
         }
-    
     if (Rect().Contains(aPointerEvent.iPosition) && (aPointerEvent.iType == TPointerEvent::EButton1Up)
-        && iIsAlarm && iCaptured)
+        && iIsAlarm)
         {
         if (!iIsAlarmWakeup)
             {
@@ -789,10 +788,12 @@
         {
         CAknStaticNoteDialog::HandlePointerEventL(aPointerEvent);
         }
-    if (aPointerEvent.iType == TPointerEvent::EButton1Up)
+    
+    if(aPointerEvent.iType == TPointerEvent::EButton1Up)
         {
         iCaptured = EFalse;
         }
+    
     }
 
 // class CAknGlobalNoteSubject
@@ -1454,7 +1455,7 @@
 
 void CAknGlobalNoteSubject::TryDisplayNextNoteL(TBool aShowAsynch)
     {
-    if ( !iGlobalNoteList || iGlobalNoteList->Count() == 0 )
+    if ( iGlobalNoteList && iGlobalNoteList->Count() == 0 )
         {
         return;
         }