--- a/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -19,13 +19,15 @@
 #include "WidgetRegistrationManager.h"
 #include "WidgetInstaller.h"
 #include <apgcli.h>
-#include <APGICNFL.h>
+#include <apgicnfl.h>
+
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <apgicnflpartner.h>
-//#include <apgicnflinternal.h> // missing 
+//#include <apgicnflinternal.h> // missing
 #endif
-#include <S32MEM.H>
-#include <widgetregistrydata.h>
+
+#include <s32mem.h>
+#include <WidgetRegistryData.h>
 
 // CONSTANTS
 _LIT(KMBMExt, ".mbm");
@@ -98,31 +100,11 @@
     User::LeaveIfError( apparcSession.Connect() );
 
     apparcSession.PrepareNonNativeApplicationsUpdatesL();
-    apparcSession.DeregisterNonNativeApplicationL( aUid );    
+    apparcSession.DeregisterNonNativeApplicationL( aUid );
+    apparcSession.DeregisterNonNativeApplicationTypeL( aUid );
     apparcSession.CommitNonNativeApplicationsUpdatesL();
     apparcSession.Close();
     }
-    
-// ============================================================================
-// CWidgetRegistrationManager::DeregisterWidgetL()
-// Deregister installed widgets as non native app
-//
-// @since 5.1
-// ============================================================================
-//    
-void CWidgetRegistrationManager::DeregisterWidgetsL( const RArray<TUid>& aUidList )
-	{	
-	RApaLsSession apparcSession;
-    User::LeaveIfError( apparcSession.Connect() );
-
-    apparcSession.PrepareNonNativeApplicationsUpdatesL();
-    for(TInt i = 0;i<aUidList.Count();i++)
-    	{
-    	apparcSession.DeregisterNonNativeApplicationL( aUidList[i] );    	
-    	}    
-    apparcSession.CommitNonNativeApplicationsUpdatesL();
-    apparcSession.Close();
-	}
 
 // ============================================================================
 // CWidgetRegistrationManager::RegisterWidgetL()
@@ -145,6 +127,12 @@
     RApaLsSession apparcSession;
     CleanupClosePushL( apparcSession );
     User::LeaveIfError( apparcSession.Connect() );
+    // TODO move this where it is only done once
+    apparcSession.PrepareNonNativeApplicationsUpdatesL();
+    apparcSession.DeregisterNonNativeApplicationL( KUidWidgetLauncher );
+    apparcSession.DeregisterNonNativeApplicationTypeL( KUidWidgetLauncher );
+    apparcSession.CommitNonNativeApplicationsUpdatesL();
+    // TODO end
 
     // reasonably like an acceptable file name
     TBuf<KWidgetRegistryVal> appName;