--- a/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Tue Aug 31 16:17:46 2010 +0300
@@ -23,10 +23,11 @@
 // INCLUDES
 #include <e32hashtab.h>
 #include <apgcli.h>
-#include <browser_platform_variant.hrh>
-#include <widgetregistrydata.h>
-#include <widgetregistryconstants.h>
-#include <widgetpropertyvalue.h>
+#include <Browser_platform_variant.hrh>
+#include <apgnotif.h>
+#include "WidgetRegistryData.h"
+#include "WidgetRegistryConstants.h"
+#include "WidgetPropertyValue.h"
 #include "WidgetRegistryLog.h"
 
 // CONSTANTS
@@ -36,7 +37,6 @@
 
 // FORWARD DECLARATIONS
 class RFs;
-class CWidgetMMCHandler;
 class CWidgetEntry;
 class CWidgetInstaller;
 class CWidgetRegistryXml;
@@ -58,7 +58,7 @@
 *  @since 3.1
 */
 
-class CWidgetRegistry : public CBase
+class CWidgetRegistry : public CBase, public MApaAppListServObserver
     {
 public:
     /**
@@ -214,9 +214,10 @@
      * Returns security policyId.
      */
      TInt SecurityPolicyId() { return FetchSecurityPolicyIdL(); }
-     
-     static void NotifyWidgetAltered();
-     
+
+		//from MApaAppListServObserver
+		void HandleAppListEvent(TInt aEvent);
+
 private:
 
     /**
@@ -233,11 +234,6 @@
      * Get widget entry with a particular UId
      */
     TInt GetWidgetEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const;
-    
-    /**
-     * Get widget entry with a particular UId
-     */
-    TInt GetWidgetOldEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const;
 
     /**
      * Get widget entry with a particular bundle Id
@@ -359,7 +355,6 @@
     RWidgetArray                iEntries;
     RUidArray                   iUsedUids;
     RFs                         iFs; // not owned
-    RPointerArray<CWidgetEntry>        iOldEntries; // Hold the earlier entries from iEntries
 
     // added for validation purpose
     RApaLsSession               iAppArch;
@@ -367,15 +362,14 @@
     TBuf<KWidgetRegistryMaxPathName> iWidgetInstallPath;
     TBuf<KWidgetRegistryMaxPathName> iRegistryBinaryFileName;
     TBuf<KWidgetRegistryMaxPathName> iRegistryXmlFileName;
-    TBuf<KWidgetRegistryMaxPathName> iRegistryCWRTXmlFileName;
     TBuf<KWidgetRegistryMaxPathName> iRegistryXmlTempFileName;
     TBuf<KWidgetRegistryMaxPathName> iLprojName;
 
     // map of language code to lproj dir
     RPtrHashMap<TInt,HBufC8>    iLangDirList;
-    CWidgetMMCHandler*          iMMCHandler;
     TInt                        iPolicyId;
     CWidgetRegistryXml*         iXmlProcessor;
+    CApaAppListNotifier* iApaAppListNotifier;
 public:
     LOG_MEMBER_VARS
     };