--- a/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Thu May 27 12:58:35 2010 +0300
+++ b/iaupdate/IAD/ui/inc/iaupdateuicontroller.h	Fri Jun 11 13:45:18 2010 +0300
@@ -28,6 +28,7 @@
 #include "iaupdatecontrollerobserver.h"
 #include "iaupdatenodeobserver.h"
 #include "iaupdatewaitdialogobserver.h"
+#include "iaupdatedialogobserver.h"
 #include "iaupdatestarterobserver.h"
 #include "iaupdateroaminghandlerobserver.h"
 #include "iaupdaterefreshobserver.h"
@@ -48,10 +49,12 @@
 class MIAUpdateHistory;
 class MIAUpdateFwNode;
 class IAUpdateWaitDialog;
+class IAUpdateDialogUtil;
 
 class QString;
 class CIAUpdateNodeId;
 class CEikonEnv;
+class HbAction;
 
 
 // CLASS DECLARATION
@@ -66,7 +69,8 @@
     public MIAUpdateWaitDialogObserver,
     public MIAUpdateStarterObserver,
     public MIAUpdateRoamingHandlerObserver,
-    public MIAUpdateRefreshObserver
+    public MIAUpdateRefreshObserver,
+    public IAUpdateDialogObserver
     {
            
 public: //new functions
@@ -330,6 +334,10 @@
      * This is called when the dialog is  closed.
      */
      void HandleWaitDialogCancel();   
+     
+private: // From IAUpdateDialogObserver     
+         
+     void dialogFinished(HbAction *action);   
     
 
 private: // From MIAUpdateRefreshObserver   
@@ -354,6 +362,8 @@
 
 
 private: // new functions
+    
+    void AgreementHandledL();
 
     /**
      * Called when refreshing updates list is completed.
@@ -546,6 +556,14 @@
         ESelfUpdating
         };
 
+    enum TDialogState
+        {
+        ENoDialog,
+        EAgreement,
+        EInsufficientMemory  
+        };
+    
+    
     MIAUpdateUiControllerObserver& iObserver;
 
     MIAUpdateController* iController;
@@ -559,6 +577,8 @@
     RPointerArray<CIAUpdateNodeId> iPreviousSelections;
     
     RPointerArray<MIAUpdateNode> iServicePackNodes;
+    
+    IAUpdateDialogUtil *mDialogUtil;  
  
     IAUpdateWaitDialog *mWaitDialog;
     
@@ -586,6 +606,8 @@
     
     TState iState;
     
+    TDialogState iDialogState;
+    
     TBool iClosingAllowedByClient;
     
     CIAUpdateUiConfigData* iConfigData;
@@ -605,6 +627,8 @@
     TBool iForcedRefresh;
         
     TBool iTestRole;
+    
+    HbAction *mPrimaryAction;
 
     };