diff -r c18f9fa7f42e -r 640d30f4fb64 phonebookui/cntcommonui/cntcommonui.pro
--- a/phonebookui/cntcommonui/cntcommonui.pro	Fri Oct 08 11:42:51 2010 +0300
+++ b/phonebookui/cntcommonui/cntcommonui.pro	Fri Oct 15 12:24:46 2010 +0300
@@ -27,11 +27,11 @@
 DEPENDPATH += .
 INCLUDEPATH += .
 INCLUDEPATH += ../../inc
-INCLUDEPATH += ../../phonebookengines/cntlistmodel/inc
 INCLUDEPATH += ../../phonebookengines/cntimageutility/inc
 INCLUDEPATH += ../../phonebookengines/cntsimutility/inc
 INCLUDEPATH += ../phonebookapp/inc
-INCLUDEPATH += ../cnthistorymodel/inc
+INCLUDEPATH += ../cntlistmodel
+INCLUDEPATH += ../cnthistorymodel
 
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
@@ -68,6 +68,7 @@
 
 # Input
 HEADERS += ../../inc/cntdebug.h \
+    core/cntactivities.h \
     core/cntabstractviewfactory.h \
     core/cntdefaultengine.h \
     core/cntdefaultviewmanager.h \ 
@@ -135,6 +136,7 @@
     views/cntbaseselectionview.h \
     views/cnthistoryview.h \
     views/cnthistoryviewitem.h \
+    views/cnthistoryviewitemwidget.h \
     views/cntimageeditorview.h \
     views/cntimportsview.h \
     views/cntimportviewcallback.h \ 
@@ -143,13 +145,16 @@
     views/cntnamesview_p.h \
     views/cntsettingsmodel.h \
     views/cntsettingsview.h \
+    views/cntpinchgrabber.h \
+    views/cntnamesviewitem.h \
     widgets/cntactionpopup.h \
     widgets/cntactionpopup_p.h \   
     widgets/cntfetchcontactpopup.h \
     widgets/cntfetchmarkall.h \
     widgets/cntimagelabel.h      
 
-SOURCES += core/cntdefaultengine.cpp \
+SOURCES += core/cntactivities.cpp \
+    core/cntdefaultengine.cpp \
     core/cntdefaultviewfactory.cpp \
     core/cntdefaultviewmanager.cpp \ 
     core/cntextensionmanager.cpp \
@@ -214,6 +219,7 @@
     views/cntbaseselectionview.cpp \
     views/cnthistoryview.cpp \
     views/cnthistoryviewitem.cpp \
+    views/cnthistoryviewitemwidget.cpp \
     views/cntimageeditorview.cpp \
     views/cntimportsview.cpp \
     views/cntmycardview.cpp \
@@ -221,6 +227,8 @@
     views/cntnamesview_p.cpp \
     views/cntsettingsmodel.cpp \
     views/cntsettingsview.cpp \   
+    views/cntpinchgrabber.cpp \
+    views/cntnamesviewitem.cpp \
     widgets/cntactionpopup_p.cpp \
     widgets/cntactionpopup.cpp \
     widgets/cntfetchcontactpopup.cpp \
@@ -270,4 +278,5 @@
     "$${LITERAL_HASH}else" \
     "DEFFILE ../bwins/cntcommonui.def" \
     "$${LITERAL_HASH}endif"
-MMP_RULES += defBlock
\ No newline at end of file
+MMP_RULES += defBlock
+symbian:MMP_RULES += SMPSAFE
\ No newline at end of file