diff -r 1f002146abb4 -r 8d5d7fcf9b59 satui/satapp/tsrc/ut_satapp/ut_satapp.pro
--- a/satui/satapp/tsrc/ut_satapp/ut_satapp.pro	Tue Jul 06 14:53:02 2010 +0300
+++ b/satui/satapp/tsrc/ut_satapp/ut_satapp.pro	Wed Jul 21 18:26:52 2010 +0300
@@ -15,69 +15,71 @@
 #
 
 TEMPLATE = app
-TARGET = utsatapp
+TARGET = ut_satapp
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG += hb
 CONFIG += qtestlib
 HEADERS += $$PUBLIC_HEADERS
-MOC_DIR = moc_utsatapp
+MOC_DIR = moc
 
 symbian {
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
-                   .inc \
-                    ../../../../inc \
-                    .MOC_DIR 
+    TARGET.CAPABILITY = CAP_APPLICATION
+}
+
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+               $$MOC_DIR \
+               ../../../../inc \
+               ../../inc
 
-    LIBS += -lSatClient.dll \
-            -lSatInternalClient.dll \
-            -legul.dll \
-            -lfbscli.dll \
-            -lcentralrepository.dll \
-            -lCenRepNotifHandler.dll \
-            -lCdlEngine.dll \
-            -lFlogger.dll \
-            -lbafl.dll \
-            -lprofileeng.dll 
+LIBS += -legul \
+        -lfbscli \
+        -lcentralrepository \
+        -lCenRepNotifHandler \
+        -lCdlEngine \
+        -lbafl \
+        -lmediaclientaudio \
+        -lprofileeng \
+        -lFlogger
 
-    HEADERS += ../../inc \
-               ../../inc/msatuiactionimplementer.h \
-               ../../inc/satappcommonconstant.h \
-               ../../inc/tflogger.h \
-               ../../inc/satappmainhandler.h \
-               ../../inc/csatuiobserver.h\
-               ../../inc/satappcommandhandler.h \
-               ../../inc/satappeventprovider.h \
-               ../../inc/satappuiprovider.h \
-               ../../inc/satappview.h \
-               ../../inc/satappgetinkeynote.h \
-               ../../inc/csatuiobserver.h \
-               ../../inc/csatuiiconhandler.h \
-               ../../inc/satappplaytoneprovider.h \
-               inc/dummyeventprovider.h \
-               inc/dummyplaytoneprovider.h \
-               inc/ut_satappmainhandler.h \
-               inc/ut_csatuiobserver.h \
-               inc/ut_satappeventhandler.h \
-               inc/ut_playtoneprovider.h 
+HEADERS += ../../inc \
+           ../../inc/satappmainhandler.h \
+           ../../inc/satappserverdispatcher.h \
+           ../../inc/satappmenuprovider.h \
+           ../../inc/satappinputprovider.h \
+           ../../inc/satapptoneprovider.h \
+           ../../inc/satapppopupprovider.h \
+           ../../inc/satappconfirmprovider.h \
+           ../../inc/satappaction.h \
+           ../../inc/satappconstant.h \
+           inc/ut_satappmainhandler.h \
+           inc/ut_satappserverdispatcher.h \
+           inc/ut_satappmenuprovider.h \
+           inc/ut_satappinputprovider.h \
+           inc/ut_satapptoneprovider.h \
+           inc/ut_satapppopupprovider.h \
+           inc/ut_satappconfirmprovider.h \
+           inc/ut_satappaction.h
 
 
-    SOURCES +=  ../../src/csatuiobserver.cpp \
-               ../../src/satappmainhandler.cpp \
-               ../../src/satappcommandhandler.cpp \
-               ../../src/satappuiprovider.cpp \
-               ../../src/satappeventprovider.cpp \
-               ../../src/satappview.cpp \
-               ../../src/satappgetinkeynote.cpp \
-               ../../src/csatuiiconhandler.cpp\
-               ../../src/satappplaytoneprovider.cpp\
-               src/main.cpp \
-               src/dummyeventprovider.cpp \
-               src/dummyplaytoneprovider.cpp \
-               src/ut_satappmainhandler.cpp \
-               src/ut_csatuiobserver.cpp \
-               src/ut_satappeventhandler.cpp \
-               src/ut_playtoneprovider.cpp 
+SOURCES += ../../src/satappmainhandler.cpp \
+           ../../src/satappserverdispatcher.cpp \
+           ../../src/satappmenuprovider.cpp \
+           ../../src/satappinputprovider.cpp \
+           ../../src/satapptoneprovider.cpp \
+           ../../src/satapppopupprovider.cpp \
+           ../../src/satappconfirmprovider.cpp \
+           ../../src/satappaction.cpp \
+           src/main.cpp \
+           src/ut_satappmainhandler.cpp \
+           src/ut_satappserverdispatcher.cpp \
+           src/ut_satappmenuprovider.cpp \
+           src/ut_satappinputprovider.cpp \
+           src/ut_satapptoneprovider.cpp \
+           src/ut_satapppopupprovider.cpp \
+           src/ut_satappconfirmprovider.cpp \
+           src/ut_satappaction.cpp \
+           src/rsat_stub.cpp
 
-}
+RESOURCES += ../../resource/satapp.qrc
+