--- a/homescreenapp/hsutils/src/xqaiwgetimageclient.cpp	Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/hsutils/src/xqaiwgetimageclient.cpp	Fri Jun 25 19:19:22 2010 +0300
@@ -33,11 +33,18 @@
 #endif //COVERAGE_MEASUREMENT
 
 
+/*!
+    \class XQAIWGetImageClient
+    \ingroup group_hsutils
+    \brief 
+*/
+
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 XQAIWGetImageClient::XQAIWGetImageClient():
-    mImageGrid(0)
+    mImageGrid(0),
+    mCurrentView(0)
 {
     mImageGrid = new HsImageGridWidget(QStringList(), 0);
     mBackAction = new HbAction(Hb::BackNaviAction, this);
@@ -56,11 +63,8 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
-void XQAIWGetImageClient::fetch( QVariantMap filter, XQAIWMultimediaFlags flag)
+void XQAIWGetImageClient::fetch()
 {
-    Q_UNUSED(filter)
-    Q_UNUSED(flag)
-
     QStringList imageDirNames;
     QStringList imageDirs;
 
@@ -111,6 +115,7 @@
 
     connect(mImageGrid, SIGNAL(imageSelected(QString)), SLOT(imageSelected(QString)));
 
+    mCurrentView = window->currentView();
     window->addView(mImageGrid);
     window->setCurrentView(mImageGrid, false);
 
@@ -124,14 +129,11 @@
 {
     Q_UNUSED(val)
     mImageGrid->disconnect(this);
-    QStringList list;
-
-    list << val;
 
     HbMainWindow *window = HbInstance::instance()->allMainWindows().first();
     window->removeView(mImageGrid);
     
-    emit fetchComplete(list);
+    emit fetchCompleted(val);
     QStringList images;
     mImageGrid->setContent(images);
 }
@@ -150,8 +152,10 @@
 
     HbMainWindow *window = HbInstance::instance()->allMainWindows().first();
     window->removeView(mImageGrid);
-    
-    emit fetchFailed(-1);//KErrNotFound
+    window->setCurrentView(mCurrentView, false);
+    mCurrentView = 0;
+    emit fetchFailed(-1, QString("")); //KErrNotFound
+
     QStringList images;
     mImageGrid->setContent(images);
 }