--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/inc/GifAnimationPlugin.h	Thu Jan 07 12:46:37 2010 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/inc/GifAnimationPlugin.h	Mon Jan 18 20:19:52 2010 +0200
@@ -27,7 +27,7 @@
 #include <barsread.h>
 
 #include <npupp.h>
-#include <PluginAdapterInterface.h>
+#include <pluginadapterinterface.h>
 #include <CEcomBrowserPluginInterface.h>
 #include <MIHLViewerObserver.h>
 

--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPlugin.cpp	Thu Jan 07 12:46:37 2010 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPlugin.cpp	Mon Jan 18 20:19:52 2010 +0200
@@ -25,7 +25,7 @@
 #include <fbs.h>
 #include <gdi.h>
 #include <f32file.h>
-#include <CEcomBrowserPluginInterface.h>
+#include <cecombrowserplugininterface.h>
 
 #include "GifAnimationPlugin.h"
 #include "GifAnimationUtils.h"

--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Thu Jan 07 12:46:37 2010 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Mon Jan 18 20:19:52 2010 +0200
@@ -489,25 +489,22 @@
 //
 void CGifAnimationPluginControl::ViewerBitmapChangedL()
     {   
-    if ( iSourceImage )
+    switch ( iAnimationState )
         {
-        switch ( iAnimationState )
+        case EAnimationLoading:
             {
-            case EAnimationLoading:
-                {
-                iAnimationState = EAnimationPlaying;
-                break;
-                }
-            case EAnimationPlaying:
-                {
-                // do nothing 
-                break;
-                }
-            case EAnimationNotReady:
-            default:
-                {
-                break;
-                }
+            iAnimationState = EAnimationPlaying;
+            break;
+            }
+        case EAnimationPlaying:
+            {
+            // do nothing 
+            break;
+            }
+        case EAnimationNotReady:
+        default:
+            {
+            break;
             }
         }
     

--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginMain.cpp	Thu Jan 07 12:46:37 2010 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginMain.cpp	Mon Jan 18 20:19:52 2010 +0200
@@ -20,7 +20,7 @@
 
 
 #include <ecom/implementationproxy.h>
-#include <CEcomBrowserPluginInterface.h>
+#include <cecombrowserplugininterface.h>
 
 
 #include "GifAnimationPlugin.h"

--- a/src/screensavershareddatai.cpp	Thu Jan 07 12:46:37 2010 +0200
+++ b/src/screensavershareddatai.cpp	Mon Jan 18 20:19:52 2010 +0200
@@ -24,7 +24,7 @@
 #include <centralrepository.h>
 #include <coreapplicationuisdomainpskeys.h>  // KCoreAppUIsUipInd, KLightsVTForcedLightsOn
 #include <activeidle2domainpskeys.h>         // KPSUidAiInformation
-#include <SettingsInternalCRKeys.h>          // KSettingsScreenSaverPeriod
+#include <settingsinternalcrkeys.h>          // KSettingsScreenSaverPeriod
 #include <LogsDomainCRKeys.h>                // KLogsNewMissedCalls
 #include <ScreensaverInternalCRKeys.h>
 #include <AvkonInternalCRKeys.h>             // KAknNewContactsNoteActive