--- a/filemanager/src/filemanager/src/fmviewmanager.cpp	Fri Sep 17 08:27:42 2010 +0300
+++ b/filemanager/src/filemanager/src/fmviewmanager.cpp	Mon Oct 04 00:06:46 2010 +0300
@@ -30,6 +30,7 @@
 #include "fmdrivewatcher.h"
 #include "fmdialog.h"
 #include "fmdlgutils.h"
+#include "fmserviceutils.h"
 
 #include <hbview.h>
 #include <hbmainwindow.h>
@@ -39,8 +40,6 @@
 #include <QFileInfo>
 #include <QPixmap>
 
-#include <shareui.h>
-
 FmViewManager *FmViewManager::mViewManager = 0;
 
 
@@ -75,7 +74,8 @@
 	return mDialog;
 }
 
-FmViewManager::FmViewManager( FmMainWindow* mainWindow ) : mOperationService( 0 ), mShareUi( 0 )
+FmViewManager::FmViewManager( FmMainWindow* mainWindow ) 
+    : mOperationService( 0 ), mServiceUtils( 0 )
 {
     mMainWindow = mainWindow;
     mDriveWatcher = new FmDriveWatcher( this );
@@ -101,8 +101,8 @@
     delete mDriveWatcher;
     mDriveWatcher = 0;
     
-    delete mShareUi;
-    mShareUi = 0;
+    delete mServiceUtils;
+    mServiceUtils = 0;
 
 }
 
@@ -130,19 +130,20 @@
     if ( !mOperationService ) {
         mOperationService = new FmOperationService( this );
         mOperationService->setObjectName( "operationService" );
+        QMetaObject::connectSlotsByName( this );
     }    
     return mOperationService;
 }
 
 /*
-   return \a shareUi which is used to send files. 
+   return \a FmServiceUtils. 
  */
-ShareUi *FmViewManager::shareUi()
+FmServiceUtils *FmViewManager::serviceUtils()
 {
-    if( !mShareUi ) {
-        mShareUi = new ShareUi;
+    if( !mServiceUtils ) {
+        mServiceUtils = new FmServiceUtils;
     }
-    return mShareUi;
+    return mServiceUtils;
 }
 
 void FmViewManager::popViewAndShow()
@@ -205,6 +206,7 @@
     mMainWindow->setCurrentView( driverView );
     HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();        
     bool ok = activityManager->removeActivity("FMMemoryStoragesList");
+    Q_UNUSED( ok );
 
     connect( this, SIGNAL( driveSpaceChanged() ), 
         driverView, SLOT( refreshDrive() ) );
@@ -236,7 +238,7 @@
     }
    
     if( checkedPath.isEmpty() ) {
-        FmDlgUtils::information( QString( hbTrId("Path: %1 is unavailable!").arg( path )) );
+        FmDlgUtils::warning( QString( hbTrId("Path: %1 is unavailable!").arg( path )) );
         return;
     }
 
@@ -353,7 +355,7 @@
     // add the activity to the activity manager
     bool ok = activityManager->addActivity("FMMemoryStoragesList", QVariant(), metadata);
     // do not need check return value
-
+    Q_UNUSED( ok );
 }
 
 void FmViewManager::onAboutToChangeView(HbView * oldView, HbView *newView)