--- a/contentstorage/casrv/causifscanner/src/causifscanner.cpp	Tue Jun 29 10:20:30 2010 +0300
+++ b/contentstorage/casrv/causifscanner/src/causifscanner.cpp	Fri Jul 09 14:19:08 2010 +0300
@@ -35,7 +35,7 @@
 CCaUsifScanner* CCaUsifScanner::NewL( TPluginParams* aPluginParams )
     {
     CCaUsifScanner* self = new ( ELeave ) CCaUsifScanner(
-            *aPluginParams->storageProxy );
+            *aPluginParams->storageProxy, *aPluginParams->softwareRegistry );
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -46,8 +46,9 @@
 //
 // ---------------------------------------------------------------------------
 //
-CCaUsifScanner::CCaUsifScanner( CCaStorageProxy& aStorageProxy ) :
-    iStorageProxy( aStorageProxy )
+CCaUsifScanner::CCaUsifScanner( CCaStorageProxy& aStorageProxy,
+    RSoftwareComponentRegistry& aSoftwareRegistry ) :
+        iStorageProxy( aStorageProxy ), iSoftwareRegistry(aSoftwareRegistry)
     {
     }
 
@@ -69,8 +70,6 @@
     User::LeaveIfError( iFs.Connect() );
     iMmcWatcher = CCaMmcWatcher::NewL( iFs, this );
 
-    User::LeaveIfError( iSoftwareRegistry.Connect() );
-
     UpdateUsifListL();
     }
 
@@ -80,7 +79,6 @@
 //
 CCaUsifScanner::~CCaUsifScanner()
     {
-    iSoftwareRegistry.Close();
     delete iMmcWatcher;
     iFs.Close();
     delete iJavaInstallNotifier;