idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp
changeset 1 5315654608de
parent 0 f72a12da539e
child 2 08c6ee43b396
--- a/idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp	Thu Dec 17 08:40:49 2009 +0200
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp	Thu Jan 07 12:39:41 2010 +0200
@@ -2331,6 +2331,10 @@
             attrs.FindByName( XnPropertyNames::action::KName ) );
         CXnDomAttribute* valueAttribute = static_cast< CXnDomAttribute* >(
             attrs.FindByName( XnPropertyNames::action::KValue ) );
+        if ( !nameAttribute || !valueAttribute )
+            {
+            continue;
+            }
         if ( nameAttribute->Value() ==
              XnPropertyNames::action::trigger::name::keyevent::KEventType )
             {
@@ -2522,6 +2526,10 @@
             attrs.FindByName( XnPropertyNames::action::KName ) );
         CXnDomAttribute* valueAttribute = static_cast< CXnDomAttribute* >(
             attrs.FindByName( XnPropertyNames::action::KValue ) );
+        if ( !nameAttribute || !valueAttribute )
+            {
+            continue;
+            }
         if ( nameAttribute->Value() ==
              XnPropertyNames::action::trigger::name::stylus::KStylusState )
             {
@@ -2677,6 +2685,11 @@
                 CXnDomAttribute* valueAttribute = static_cast< CXnDomAttribute* >(
                     attrs.FindByName( XnPropertyNames::action::KValue ) );
 
+                if ( !nameAttribute || !valueAttribute )
+                    {
+                    return EFalse;
+                    }
+                
                 const TDesC8& name = nameAttribute->Value();
 
                 // check that eventype name matches
@@ -7520,17 +7533,7 @@
 
                 if ( popup )
                     {
-                    if ( aSource == XnEventSource::EStylus )
-                        {
-                        const TTimeIntervalMicroSeconds32 delay( 0 );                       
-                        const TTimeIntervalMicroSeconds32 display( 1000 * 1000 * 6 );                                                
-                        
-                        popup->ShowPopupL( aRect, delay, display );
-                        }
-                    else
-                        {
-                        popup->ShowPopupL( aRect );
-                        }                    
+                    popup->ShowPopupL( aRect );
                     }
                 }
             }