--- a/btobexprofiles/obexserviceman/utils/group/obexutils.mmp	Fri Jun 11 13:48:51 2010 +0300
+++ b/btobexprofiles/obexserviceman/utils/group/obexutils.mmp	Wed Jun 23 18:23:52 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 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,34 +26,25 @@
 UID           0x10004262 0x101F86AF
 VENDORID      VID_DEFAULT
 
-START RESOURCE  ../data/Obexutils.rss
-TARGETPATH RESOURCE_FILES_DIR  
-HEADER
-LANGUAGE_IDS
-END
-
 OS_LAYER_SYSTEMINCLUDE
 USERINCLUDE ../inc
 NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE
 
-
 SOURCEPATH    ../src
-SOURCE        obexutilsuilayer.cpp
-SOURCE        obexutilslaunchwaiter.cpp
 SOURCE        obexutilsdialogtimer.cpp
 SOURCE        obexutilsdialog.cpp
 SOURCE        obexutilsmessagehandler.cpp
 SOURCE        obexutilspropertynotifier.cpp
 SOURCE        obexutilsopaquedata.cpp
-SOURCE        obexutilsglobalprogressdialog.cpp
-SOURCE        obexutilsglobaldialog.cpp
 SOURCE        obexutilsentryhandler.cpp
 SOURCE        updatemusiccollection.cpp
 #ifdef __BT_SAP
- SOURCE       vMessageHandler.cpp
+SOURCE       vMessageHandler.cpp
 #endif
 
 SYSTEMINCLUDE  ../../../inc ../../../../inc  
+SYSTEMINCLUDE  /epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE  /epoc32/include/mw/hb/hbcore
 #ifdef NO101APPDEPFIXES
 APP_LAYER_SYSTEMINCLUDE
 #else   //NO101APPDEPFIXES
@@ -66,37 +57,27 @@
 
 LIBRARY         apgrfx.lib
 LIBRARY         apmime.lib
-LIBRARY         avkon.lib
 LIBRARY         bafl.lib 
 LIBRARY         bifu.lib
 LIBRARY         biodb.lib
 LIBRARY         charconv.lib
-LIBRARY         cone.lib
-LIBRARY         commonengine.lib
-LIBRARY         commonui.lib
 LIBRARY         efsrv.lib
-LIBRARY         eikctl.lib
 LIBRARY         etext.lib
 LIBRARY         euser.lib
 LIBRARY         irobex.lib
 LIBRARY         msgs.lib
-LIBRARY         aknskins.lib        
 LIBRARY         centralrepository.lib
-LIBRARY         apparc.lib
-LIBRARY         servicehandler.lib
-LIBRARY         eikdlg.lib
-LIBRARY         featmgr.lib
-LIBRARY         aknnotify.lib
-LIBRARY 		commondialogs.lib 
 LIBRARY			platformenv.lib 
 LIBRARY			mpxcollectionhelper.lib
 LIBRARY			mpxplaybackutility.lib
+LIBRARY			hbcore.lib
+LIBRARY			HbWidgets.lib
 
 #ifdef __BT_SAP
- LIBRARY        smcm.lib
- LIBRARY        gsmu.lib
+LIBRARY        smcm.lib
+LIBRARY        gsmu.lib
 // SMUT Unbranch 
- LIBRARY        ecom.lib
+LIBRARY        ecom.lib
 #endif
 
 DEBUGLIBRARY    flogger.lib