--- a/uifw/AvKon/inc/AknSmileyImage.h	Fri Feb 19 23:04:46 2010 +0200
+++ b/uifw/AvKon/inc/AknSmileyImage.h	Fri Mar 12 15:43:43 2010 +0200
@@ -50,6 +50,8 @@
 
 ////////////////////////////////////////////////////////////////////
 
+// CSmileyImage can be a still or animated svg image
+
 class CSmileyImage : public CBase, public MAknIconObserver
     {
 public:
@@ -71,46 +73,45 @@
     const CFbsBitmap* Image() const;
     const CFbsBitmap* Mask() const;
 
-private: // from MAknIconObserver
-    void BitmapChanged(CFbsBitmap* aBitmap);
+private:
+    void BitmapChanged(CFbsBitmap* aBitmap); // from MAknIconObserver
+    void MonitorAnimationEndedL();
 
 private:
     void DoLoadL();
     void DoRelease();
-    void StopAnyAsynchronousTask();
-
-    void MonitorAnimationEndedL();
-    void HandleAnimationEndedL();
+    void DoHandleEndedL();
 
 private:
-    void StartLoadAsynchronousL(TInt aRepeat, TInt aDelayMicroSeconds=0);
+    inline void StopAsynchronousTaskTimer();
+ 
+    void StartLoadAsynchronousL(TInt aDelayMicroSeconds=0);
     static TInt StartLoadAsynchronousCallBackL(TAny* aPtr);
-    
-private:
+
     void StopAnimationAsynchronousL(TInt aDelayMicroSeconds=0);
     static TInt StopAnimationAsynchronousCallBackL(TAny* aPtr);
 
 private:
-    TAknsItemID             iImageSkinItem;
-    TInt                    iImagePkgItem;
+    TAknsItemID             iImageSkinItemId;
+    const TInt              iImageMifPkgItemId;
     const TBool             iIsAnimation;
-    TSize                   iSize;
+
+private:
     MSmileyImageObserver*   iImageObserver;
     CPeriodic*              iAsynchronousTaskTimer;
 
 private:
+    TSize                   iSize;
     CFbsBitmap*             iFrame;
     CFbsBitmap*             iFrameMask;
-    
-private:
+    TBool                   iReadyToDraw;
+
+private: // for animation
+    TInt                    iRepeatCount;
     CFbsBitmap*             iFrameSnap;
     TInt                    iFrameCounter;
     TInt                    iSameFrameCounter;
 
-private:
-    TBool                   iReadyToDraw;
-    TInt                    iRepeatCount;
-
     };