--- a/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp	Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp	Tue Sep 14 20:46:07 2010 +0300
@@ -182,7 +182,7 @@
     iListBox->DisableSingleClick( ETrue );
    
 	TRect listboxRect;
-    if ( CamUtility::IsNhdDevice() ) 
+    if ( AknLayoutUtils::PenEnabled() ) 
         {
         listboxRect = TouchLayout();
         }
@@ -514,7 +514,7 @@
 	PRINT(_L("Camera => CCamShootingModeContainer::Draw") )
 
     CWindowGc& gc = SystemGc();
-    if ( CamUtility::IsNhdDevice() )
+    if ( AknLayoutUtils::PenEnabled() )
         {
         TRgb color;
         if( iFullySkinned )
@@ -616,7 +616,7 @@
     if ( EStdKeyUpArrow == aKeyEvent.iScanCode ||
          EStdKeyDownArrow == aKeyEvent.iScanCode )
         {
-        if ( CamUtility::IsNhdDevice() )  
+        if ( AknLayoutUtils::PenEnabled() )  
             {
             ShowTooltipL(); 
             }
@@ -677,6 +677,8 @@
                 TInt description = R_CAM_SCENE_DESCRIPTION_LANDSCAPE_AUTOFOCUS;
                 Description = StringLoader::LoadL( description );
                 User::LeaveIfError( iDescArray.Append( Description ) );
+                delete descr;
+                descr = NULL;
                 }
             else 
                 {