--- a/appinstaller/AppMngr2/GSSettingsPlugin/src/appmngr2gssettingsplugin.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppMngr2/GSSettingsPlugin/src/appmngr2gssettingsplugin.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -364,11 +364,17 @@
 
         if( aSettingIndex == EAppMngr2SettingSwInstall )
             {
-            // Install software - toggle 'Signed only' and 'All'
-            TBool allowUntrusted = EFalse;
-            repDB->Get( KSWInstallerAllowUntrusted, allowUntrusted );
-            allowUntrusted = !allowUntrusted;
-            SetPermissionL( aSettingIndex, allowUntrusted, urlText );
+            // Install software
+            itemArray = iCoeEnv->ReadDesC16ArrayResourceL(
+                    R_APPMNGR2_ALLOW_UNTRUSTED_VALUE_ARRAY );
+            repDB->Get( KSWInstallerAllowUntrusted, newIndex );
+            if( newIndex )
+                {
+                newIndex = 1;
+                }
+            dlg = new ( ELeave ) CAknRadioButtonSettingPage(
+                    R_APPMNGR2_SET_PAGE_ALLOW_UNTRUSTED,
+                    newIndex, itemArray );
             }
         else
             {
@@ -383,7 +389,7 @@
         CleanupStack::PopAndDestroy( repDB );
         CleanupStack::PushL( itemArray );
 
-        if( dlg && dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
+        if( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
             {
             SetPermissionL( aSettingIndex, newIndex, urlText );
             }

--- a/appinstaller/AppMngr2/Widget/inc/appmngr2widgetruntime.h	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/inc/appmngr2widgetruntime.h	Fri Mar 19 09:33:35 2010 +0200
@@ -20,7 +20,7 @@
 #define C_APPMNGR2WIDGETRUNTIME_H
 
 #include <appmngr2runtime.h>            // CAppMngr2Runtime
-#include <widgetregistryclient.h>       // RWidgetRegistryClientSession 
+#include <WidgetRegistryClient.h>       // RWidgetRegistryClientSession 
 
 class CAppMngr2PackageInfo;
 class CAknIconArray;

--- a/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -20,7 +20,7 @@
 #include "appmngr2widgetruntime.h"      // KAppMngr2WidgetUid
 #include "appmngr2widgetinfoiterator.h" // CAppMngr2WidgetInfoIterator
 #include "appmngr2widget.hrh"           // Widget command IDs
-#include <widgetregistrydata.h>         // CWidgetInfo
+#include <WidgetRegistryData.h>         // CWidgetInfo
 #include <appmngr2driveutils.h>         // TAppMngr2DriveUtils
 
 

--- a/appinstaller/AppMngr2/src/appmngr2filerecognizer.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppMngr2/src/appmngr2filerecognizer.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -200,10 +200,10 @@
         
         HBufC* mimeType = HBufC::NewLC( KMaxDataTypeLength );
         TPtr mimePtr( mimeType->Des() );
-        content->GetStringAttribute( ContentAccess::EMimeType, mimePtr );
-        
+        User::LeaveIfError( content->GetStringAttribute( ContentAccess::EMimeType, mimePtr ) );
+
         CAppMngr2RecognizedFile* recFile = CAppMngr2RecognizedFile::NewL( fullName, mimeType );
-        CleanupStack::Pop( mimeType );
+        CleanupStack::Pop( mimeType );		// CAppMngr2RecognizedFile takes ownership
         CleanupStack::PopAndDestroy( content );
         CleanupStack::Pop( fullName );
         

Binary file appinstaller/AppinstUi/CenRep/keys_s60swinstalleruis.xls has changed

--- a/appinstaller/AppinstUi/Server/Data/SWInstSvrUI_reg.rss	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppinstUi/Server/Data/SWInstSvrUI_reg.rss	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
 #include "SWInstPrivateUid.h"
 
 UID2 KUidAppRegistrationResourceFile
-UID3 KSWInstSvrUid // Define your application UID here
+UID3 KSWInstSvrUid
 
 RESOURCE APP_REGISTRATION_INFO
     {
@@ -45,6 +45,7 @@
         DATATYPE { priority=EDataTypePrioritySystem; type="application/x-pip"; }
 #ifdef __WEB_WIDGETS
         , DATATYPE { priority=EDataTypePrioritySystem; type="application/x-nokia-widget"; }
+        , DATATYPE { priority=EDataTypePrioritySystem; type="application/widget"; }
 #endif
         };  
     }

--- a/appinstaller/AppinstUi/Server/Src/SWInstInstallRequest.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/appinstaller/AppinstUi/Server/Src/SWInstInstallRequest.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -389,7 +389,7 @@
     {
     HBufC* tmpMIME = HBufC::NewLC( KMaxDataTypeLength );
     TPtr mimePtr( tmpMIME->Des() );            
-    aContent.GetStringAttribute( ContentAccess::EMimeType, mimePtr );
+    User::LeaveIfError( aContent.GetStringAttribute( ContentAccess::EMimeType, mimePtr ) );
     aMIME.Copy( *tmpMIME );
     CleanupStack::PopAndDestroy( tmpMIME );
     }

--- a/iaupdate/IAD/ui/group/iaupdate.rss	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/group/iaupdate.rss	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -836,15 +836,6 @@
     }
 
 //
-// Update while roaming confirmation dialog
-//
-
-RESOURCE TBUF r_iaupdate_connect_to_server
-    {
-    buf = qtn_swupdate_connect_to_server;
-    }
-
-//
 // Automatic updates check dialog resources
 //
 
@@ -1106,13 +1097,6 @@
                      name = qtn_swupdate_automatic_update_checks;
                      setting_page_resource = r_iaupdate_auto_update_check_setting_page;
                      associated_resource = r_iaupdate_auto_update_check_texts;
-                     },
-                 AVKON_SETTING_ITEM
-                     {
-                     identifier = EIAUpdateSettingRoamingWarning;
-                     name = qtn_swupdate_roaming_warning;
-                     setting_page_resource = r_iaupdate_roaming_warning_setting_page;
-                     associated_resource = r_iaupdate_roaming_warning_texts;
                      }
                  };
 	          };

--- a/iaupdate/IAD/ui/inc/iaupdate.hrh	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/inc/iaupdate.hrh	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -52,8 +52,7 @@
 enum TIAUpdateSettingDialogItems 
     {
     EIAUpdateSettingAccessPoint = 0,
-    EIAUpdateSettingAutoUpdateCheck = 1,
-    EIAUpdateSettingRoamingWarning = 2
+    EIAUpdateSettingAutoUpdateCheck = 1
     };
 
 enum TIAUpdateSettingItemBoolean 

--- a/iaupdate/IAD/ui/inc/iaupdateprivatecrkeys.h	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/inc/iaupdateprivatecrkeys.h	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -52,16 +52,6 @@
 **/
 const TUint32 KIAUpdateAutoUpdateCheck = 0x1;
 
-/**
-* Roaming warning, integer value.
-*
-* Possible values:
-*
-* 0 = No roaming warning
-* 1 = Roaming warning
-**/
-const TUint32 KIAUpdateRoamingWarning = 0x2;
-
 
 /**
 * Checking frequency. 

--- a/iaupdate/IAD/ui/inc/iaupdateroaminghandler.h	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/inc/iaupdateroaminghandler.h	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -86,12 +86,6 @@
     */
     TBool IsRoaming();
     
-    /**
-    * Shows roaming warning dialog if needed 
-    * @return True value if network access rejected because of roaming warning
-    */
-    TBool RoamingRejectionL();
-        
 
 private:
 
@@ -116,8 +110,7 @@
 	TBool iPreparing;
 	
 	TBool iPrepared;
-	
-	TBool iRoamingConnectionAccepted;
+
     };
 
 

--- a/iaupdate/IAD/ui/inc/iaupdatesettingdialog.h	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/inc/iaupdatesettingdialog.h	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -50,8 +50,7 @@
     enum TAttributeKeys
         {
         EAccessPoint = 0,
-        EAutoUpdateCheck,
-        ERoamingWarning
+        EAutoUpdateCheck
         };
     
 	public:
@@ -245,7 +244,6 @@
 	private:
 	    TInt iAccessPoint;
         TInt iAutoUpdateCheck;
-        TInt iRoamingWarning;
         };
 
 

--- a/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -533,6 +533,8 @@
     void CreateSelectedNodesArrayL();
     
     TBool IAUpdateEnabledL() const;
+    
+    TBool AutomaticConnectionWhenRoamingL() const;
 
 private: // data
 
@@ -593,8 +595,6 @@
     
     CIAUpdateParameters* iParams;
     
-    TBool iUserRoamingRejection;
-    
     TBool iCancelling;
     
     TBool iFileInUseError;

--- a/iaupdate/IAD/ui/src/iaupdateroaminghandler.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdateroaminghandler.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -140,39 +140,7 @@
 	return iRoaming;
     }
     
-// ---------------------------------------------------------------------------
-// CIAUpdateRoamingHandler::RoamingRejectionL()
-// 
-// ---------------------------------------------------------------------------
-//    
-TBool CIAUpdateRoamingHandler::RoamingRejectionL()
-    {
-  	TBool rejected = EFalse;
-  	if ( ( iRoaming )  && ( !iRoamingConnectionAccepted ) )
-  	    {
-  		CRepository* cenrep = CRepository::NewLC( KCRUidIAUpdateSettings );
-    
-        TInt num = KErrNotFound;
-        User::LeaveIfError( cenrep->Get( KIAUpdateRoamingWarning, num ) );
-        
-        CleanupStack::PopAndDestroy( cenrep );
-        if ( num == EIAUpdateSettingValueOn ) 
-            {
-        	TInt ret = IAUpdateDialogUtil::ShowConfirmationQueryL( 
-   	                                          R_IAUPDATE_CONNECT_TO_SERVER, 
-	                                          R_AVKON_SOFTKEYS_YES_NO );
-	        if ( ret == EAknSoftkeyYes )
-	            {
-	        	iRoamingConnectionAccepted = ETrue;
-	            }
-	        else
-	            {
-	            rejected = ETrue;
-	            }
-	        }   
-  	    }
-	return rejected;
-    }
+
 
     
 // End of File  

--- a/iaupdate/IAD/ui/src/iaupdatesettingdialog.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdatesettingdialog.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -425,11 +425,7 @@
     num = iList->Attribute( EAutoUpdateCheck );
     err = cenrep->Set( KIAUpdateAutoUpdateCheck, num );
     User::LeaveIfError( err );
-    
-    num = iList->Attribute( ERoamingWarning );
-    err = cenrep->Set( KIAUpdateRoamingWarning, num );
-    User::LeaveIfError( err );
-    
+           
     TUint32 ignore = KErrNone;
     User::LeaveIfError( cenrep->CommitTransaction( ignore ) );
     CleanupStack::PopAndDestroy(); // CleanupCancelTransactionPushL()
@@ -480,14 +476,6 @@
             break;
             }
 
-        case EIAUpdateSettingRoamingWarning:
-            {
-            User::LeaveIfError( cenrep->Get( KIAUpdateRoamingWarning, iRoamingWarning ) );
-            item = new (ELeave) CAknBinaryPopupSettingItem
-                               ( aSettingId, iRoamingWarning );
-            break;
-            }
-
         default:
             {
             item = new (ELeave) CAknSettingItem( aSettingId );
@@ -548,11 +536,6 @@
             ret = iAutoUpdateCheck;
             break;
             }
-        case CIAUpdateSettingDialog::ERoamingWarning:
-            {
-            ret = iRoamingWarning;
-            break;
-            }
         default:
             {
             IAUpdateDialogUtil::Panic( KErrNotSupported );
@@ -577,12 +560,6 @@
         {
         iAutoUpdateCheck = EIAUpdateSettingValueEnable;
         }
-
-    if ( iRoamingWarning != EIAUpdateSettingValueOff &&
-         iRoamingWarning != EIAUpdateSettingValueOn )
-        {
-        iRoamingWarning = EIAUpdateSettingValueOn;
-        }
     }
 
 

--- a/iaupdate/IAD/ui/src/iaupdateuicontroller.cpp	Tue Feb 02 00:20:15 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdateuicontroller.cpp	Fri Mar 19 09:33:35 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -26,6 +26,7 @@
 #include <SWInstDefs.h>
 #include <avkon.rsg>
 #include <featurecontrol.h>
+#include <cmmanager.h>
 #include <iaupdate.rsg>
 #include <iaupdateparameters.h>
 
@@ -360,19 +361,23 @@
        	    return;	
        	    }
         }
-            
-    if ( iRequestType == IAUpdateUiDefines::EShowUpdates && iRefreshed )
+    if ( iRequestType == IAUpdateUiDefines::ECheckUpdates && 
+         AllowNetworkRefreshL() && 
+         iRoamingHandler->IsRoaming() && 
+         !AutomaticConnectionWhenRoamingL() )
+        {
+        // In Silent check updates case, global setting when roaming to be automatic 
+        // Promt dialog is not allowed in the silent check
+        // error is returned that a client (backround checker) will try again later 
+        iObserver.RefreshCompleteL( EFalse, KErrAbort );
+        }  
+    else if ( iRequestType == IAUpdateUiDefines::EShowUpdates && iRefreshed )
         {
     	iFilter->FilterAndSortNodesL( iNodes, iFwNodes );
         iObserver.RefreshCompleteL( ETrue, KErrNone );
         }
     else
         {
-        if ( IsStartedByLauncher() && AllowNetworkRefreshL() )
-            {
-        	iUserRoamingRejection = iRoamingHandler->RoamingRejectionL();
-            }
-
         TInt ret( iController->Startup() );
         if ( ret == KErrAlreadyExists )   
             {
@@ -411,43 +416,39 @@
     // started.
     iController->ResetSelfUpdate();
 
-    iUserRoamingRejection = iRoamingHandler->RoamingRejectionL();
-    if ( !iUserRoamingRejection )
+    CreateSelectedNodesArrayL();
+                
+    if ( !IAUpdateUtils::SpaceAvailableInInternalDrivesL( iSelectedNodesArray ) )
         {
-        CreateSelectedNodesArrayL();
-                
-        if ( !IAUpdateUtils::SpaceAvailableInInternalDrivesL( iSelectedNodesArray ) )
+  	    HBufC* noteText = NULL;
+        noteText = StringLoader::LoadLC( R_IAUPDATE_INSUFFICIENT_MEMORY );
+        IAUpdateDialogUtil::ShowInformationQueryL( *noteText ); 
+        CleanupStack::PopAndDestroy( noteText );
+        }
+    else
+        {
+        if ( !IsStartedByLauncher() )
             {
-    	    HBufC* noteText = NULL;
-            noteText = StringLoader::LoadLC( R_IAUPDATE_INSUFFICIENT_MEMORY );
-            IAUpdateDialogUtil::ShowInformationQueryL( *noteText ); 
-            CleanupStack::PopAndDestroy( noteText );
-            }
-        else
-            {
-            if ( !IsStartedByLauncher() )
+            if ( !iStarter )
                 {
-                if ( !iStarter )
-                    {
-                    // Notice, that the ownership of the filter parameters will
-                    // remain in the filter.
-                    CIAUpdateParameters* params = iFilter->FilterParams();
-        	        iStarter = CIAUpdateStarter::NewL( params->CommandLineExecutable(), 
+                // Notice, that the ownership of the filter parameters will
+                // remain in the filter.
+                CIAUpdateParameters* params = iFilter->FilterParams();
+      	        iStarter = CIAUpdateStarter::NewL( params->CommandLineExecutable(), 
         	                                           params->CommandLineArguments() );
-                    }
                 }
-            // Inform the controller that we are now starting updates. This way the
-            // controller can handle situations as a whole and not as one item at the
-            // time.
-            iController->StartingUpdatesL();
+            }
+        // Inform the controller that we are now starting updates. This way the
+        // controller can handle situations as a whole and not as one item at the
+        // time.
+        iController->StartingUpdatesL();
             
-            iFileInUseError = EFalse;
-            // Set the node index to -1 because ContinueUpdateL increases it by one
-            // in the beginning of the function. So, we can use the ContinueUpdateL
-            // also in here.
-            iNodeIndex = -1;
-            ContinueUpdateL( EFalse );
-            }
+        iFileInUseError = EFalse;
+        // Set the node index to -1 because ContinueUpdateL increases it by one
+        // in the beginning of the function. So, we can use the ContinueUpdateL
+        // also in here.
+        iNodeIndex = -1;
+        ContinueUpdateL( EFalse );
         }
 
 	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::StartUpdateL() end");
@@ -2267,7 +2268,6 @@
     if ( IsStartedByLauncher() )
         {
     	if ( !iRefreshFromNetworkDenied && 
-    	     !iUserRoamingRejection && 
     	     !RestartedFromSelfUpdate() )
     	    {
     		if ( LocalNodesExpiredL() )
@@ -2718,4 +2718,24 @@
     return enabled;        
     }
 
+// ---------------------------------------------------------------------------
+// CIAUpdateUiController::AutomaticConnectionWhenRoamingL()
+// ---------------------------------------------------------------------------
+//
+TBool CIAUpdateUiController::AutomaticConnectionWhenRoamingL() const
+    {
+    TBool automaticConnection = EFalse;
+    RCmManager cmManager;
+    cmManager.OpenLC();
+    TCmGenConnSettings genConnSettings;
+    cmManager.ReadGenConnSettingsL( genConnSettings );
+    CleanupStack::PopAndDestroy( &cmManager );
+    if ( genConnSettings.iCellularDataUsageVisitor == ECmCellularDataUsageAutomatic )
+        {
+        automaticConnection = ETrue;
+        }
+    return automaticConnection;
+    }
+
+
 // End of File  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/refsoftwareappmgr/group/appmanager.mmp	Fri Mar 19 09:33:35 2010 +0200
@@ -0,0 +1,36 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* using relative paths for sourcepath and user includes
+*
+*/
+
+
+TARGET			refappmanager.exe
+TARGETTYPE		exe
+
+UID				0xE8000047
+VENDORID		0x70000001   
+
+// ReadUserData is required to access the list of components installed by the user
+CAPABILITY ReadUserData
+
+SOURCEPATH		../source
+SOURCE			appmanager.cpp command.cpp
+
+USERINCLUDE		../source
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY			euser.lib efsrv.lib bafl.lib scrclient.lib sif.lib
+SMPSAFE
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/refsoftwareappmgr/group/bld.inf	Fri Mar 19 09:33:35 2010 +0200
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* @ SIF Reference Application Manager
+*
+*/
+
+
+/**
+ @file
+*/
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+PRJ_MMPFILES
+
+#ifndef TOOLS
+#ifndef TOOLS2
+
+../group/appmanager.mmp
+
+#endif // TOOLS2
+#endif // TOOLS
+
+PRJ_TESTMMPFILES
+
+#ifndef TOOLS
+#ifndef TOOLS2
+
+#endif // TOOLS2
+#endif // TOOLS