--- a/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Wed Sep 15 12:13:06 2010 +0300
+++ b/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Wed Oct 13 14:32:09 2010 +0300
@@ -26,7 +26,6 @@
 #include <caf/content.h>
 #include <driveinfo.h>
 #include <coeutils.h>
-#include <coemain.h>
 
 _LIT( KPrivateFolder, "\\Private\\" );
 _LIT( KGifFileMime, "image/gif" );
@@ -122,7 +121,6 @@
         User::Leave(KErrNotSupported);    
         }
     iImageUri = aFileName.AllocL();  
-    CreateImageDecoderL();
     }
 
 // ---------------------------------------------------------------------------
@@ -139,8 +137,6 @@
     delete iFile;
     iFile = NULL;
 
-	CloseImageDecoder();
-
     if (iIsPrivateGif)
         {
         iManager->DeleteFile(iImageUri->Des());
@@ -212,51 +208,3 @@
         }
     SetImageUriL( filePath );
     }
-
-// ---------------------------------------------------------------------------
-// CloseImageDecoder
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CGlxImageViewerManager::CloseImageDecoder()
-    {
-    TRACER("void CGlxImageViewerManager::CloseImageDecoder()");
-    if (iImageDecoder)
-        {
-        delete iImageDecoder;
-        iImageDecoder = NULL;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CreateImageDecoderL
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CGlxImageViewerManager::CreateImageDecoderL()
-    {
-    TRACER("void CGlxImageViewerManager::CreateImageDecoderL()");
-
-    CloseImageDecoder();
-
-    TInt err = KErrNone;
-    if (IsPrivate())
-        {
-        if (&ImageFileHandle())
-            {
-            GLX_DEBUG1("CGlxImageViewerManager::CreateImageDecoderL() FH");
-            TRAP(err, iImageDecoder = CImageDecoder::FileNewL(
-                    ImageFileHandle(), ContentAccess::EPeek));
-            }
-        }
-    else
-        {
-        if (ImageUri())
-            {
-            GLX_DEBUG1("CGlxImageViewerManager::CreateImageDecoderL() FN");
-            TRAP(err, iImageDecoder = CImageDecoder::FileNewL(
-                    CCoeEnv::Static()->FsSession(), ImageUri()->Des()));
-            }
-        }
-
-    GLX_DEBUG2("CGlxImageViewerManager::CreateImageDecoderL() err(%d)", err);
-    User::LeaveIfError(err);
-    }