--- a/appfw/apparchitecture/apserv/APSSES.H	Tue Aug 31 15:24:25 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSES.H	Wed Sep 01 12:24:48 2010 +0100
@@ -44,12 +44,7 @@
 	void NotifyScanComplete();
 	void SetNotify(const RMessage2& aMessage);
 	void CancelNotify();
-	
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK 	
-	void NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo);
-#else
-    void NotifyClients(TInt aReason);
-#endif	
+	void NotifyClients(TInt aReason);
 	
 	void NotifyClientForCompletionOfListPopulation();
 	void CancelListPopulationCompleteObserver();
@@ -104,11 +99,6 @@
 	
 	void ApplicationLanguageL(const RMessage2& aMessage);
 	void SetAppShortCaptionL(const RMessage2& aMessage);
-	
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK	
-	void UpdateAppListL(const RMessage2& aMessage);
-	void UpdatedAppsInfoL(const RMessage2& aMessage);	
-#endif
 private:		
 	static TInt NextDriveToScan(TInt aCurrentDrive);	
 	static TBool AppIsControlPanelItem(const CApaAppData& aAppData);
@@ -130,9 +120,7 @@
 	CApaAppList& iAppList;
 	RMessage2 iNotifyMessage;
 	RMessage2 iNotifyOnScanCompleteMsg;
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK 
 	CApsNonNativeApplicationsManager* iNonNativeApplicationsManager;
-#endif
 	RMessage2 iCompletionOfListPopulationObserverMsg;
 		
 	TAppListType iAppListType;
@@ -142,11 +130,6 @@
 	TUint iCapabilityAttrFilterValue; // contains bit flags from TCapabilityAttribute
 	TUid iServiceUid;
 	RPointerArray<CApaAppInfo> iApaAppInfoArray;	//contains the most recent "snapshot" of the applist taken by GetNextAppL.
-	
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-	RArray<TApaAppUpdateInfo> iAppsUpdated;
-	TBool iNotificationRequested; //If its true updated application information is maintained in session object.
-#endif
 	};
 	
 	
@@ -160,11 +143,7 @@
 	virtual void ServiceL(const RMessage2 &aMessage);
 
 	void NotifyClientOfDataMappingChange();
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK  
-    void NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo);
-#else
-    void NotifyClients(TInt aReason);
-#endif  
+	void NotifyClients(TInt aReason);
 	void NotifyScanComplete();
 	void NotifyClientForCompletionOfListPopulation();
 private:
@@ -178,7 +157,7 @@
 	void RecognizeDataPassedByFileHandleL(const RMessage2& aMessage);
 	void RecognizeSpecificDataL(const RMessage2& aMessage);
 	void RecognizeSpecificDataPassedByFileHandleL(const RMessage2& aMessage);
-    static TPtrC8 DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage);
+	static TPtrC8 DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage);
 
 	void AppForDataTypeL(const RMessage2& aMessage);
 	TUid AppForDataTypeL(const TDataType& aDataType, const TUid* aServiceUid);
@@ -199,10 +178,8 @@
 	void AppForDataTypeAndServiceL(const RMessage2& aMessage);
 	void AppForDocumentPassedByFileHandleL(const RMessage2& aMessage, const TUid* aServiceUid);
 
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK	
 	void RegisterNonNativeApplicationTypeL(const RMessage2& aMessage);
 	void DeregisterNonNativeApplicationTypeL(const RMessage2& aMessage);
-#endif
 
 	void GetExecutableNameGivenDocumentL(const RMessage2& aMessage);
 	void GetExecutableNameGivenDocumentPassedByFileHandleL(const RMessage2& aMessage);