--- a/idlehomescreen/widgetmanager/src/wmresourceloader.cpp	Fri Jan 22 09:35:14 2010 +0200
+++ b/idlehomescreen/widgetmanager/src/wmresourceloader.cpp	Tue Jan 26 11:48:23 2010 +0200
@@ -21,9 +21,6 @@
 #include <eikappui.h>
 #include <aknapp.h>
 #include <bautils.h>
-#include <gdi.h>
-#include <aknbutton.h>
-#include <AknIconUtils.h>
 #include <StringLoader.h>
 #include <aknnotewrappers.h>
 #include <widgetmanagerview.rsg>
@@ -33,8 +30,8 @@
 // CONSTANTS
 _LIT( KZdrive, "Z:" );
 _LIT( KRelativeMifPath, "\\resource\\apps\\widgetmanager.mif" );
-_LIT( KRelativeResourcePathWithWildcard, "\\resource\\widgetmanagerview.r*" );
-_LIT( KRelativeResourcePath, "\\resource\\widgetmanagerview.rsc" );
+_LIT( KRelativeResourcePathWithWildcard, "\\resource\\apps\\widgetmanagerview.r*" );
+_LIT( KRelativeResourcePath, "\\resource\\apps\\widgetmanagerview.rsc" );
 
 // ---------------------------------------------------------
 // CWmResourceLoader::NewL
@@ -163,19 +160,6 @@
     }
 
 // ---------------------------------------------------------
-// CWmResourceLoader::LoadButtonL
-// ---------------------------------------------------------
-void CWmResourceLoader::LoadButtonL(
-        CAknButton& aResource,
-        TInt aResourceId )
-    {
-    TResourceReader reader;
-    iEnv.CreateResourceReaderLC( reader, aResourceId );
-    aResource.ConstructFromResourceL( reader );
-    CleanupStack::PopAndDestroy(); // reader
-    }
-
-// ---------------------------------------------------------
 // LoadStringLC
 // loads a string from resource. If an additional string is
 // given (the length is greater than zero) uses a different