diff -r e0aa398e6810 -r 3ab5c078b490 tsdevicedialog/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp --- a/tsdevicedialog/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp Wed Aug 18 10:05:49 2010 +0300 +++ b/tsdevicedialog/tsdevicedialogplugin/src/tsdevicedialogplugin.cpp Thu Sep 02 20:45:03 2010 +0300 @@ -15,21 +15,29 @@ * */ +#include "tsdevicedialogplugin.h" + #include #include #include #include -#include -#include + +#include +#include + +#include #include -#include "tsdevicedialogplugin.h" +#include + #include "tsdevicedialogcontainer.h" #include "tstasksgrid.h" #include "tstasksgriditem.h" #include "tsdocumentloader.h" #include "tsmodel.h" +QTM_USE_NAMESPACE + /*! \class TsDeviceDialogPlugin \ingroup group_tsdevicedialogplugin @@ -113,15 +121,12 @@ } // lazy loading of model - if (0 == mModel) { + if (!mModel) { mStorage = new TsTaskMonitor(this); - if (0 == mStorage) { - return 0; // provider of running application list is critical - } - QtMobility::QServiceManager serviceManager; + QServiceManager serviceManager; QObject *activityManager(serviceManager.loadInterface(KActivityManaged)); - if (0 != activityManager) { + if (activityManager) { activityManager->setParent(this); //make it autodestructed } else { activityManager = this; //activity plugin is not present. provide invalid instance because its not critical functionality. @@ -129,7 +134,15 @@ } mModel = new TsModel(*mStorage, *activityManager); } + + // ensure the dismiss request property is set to false + + QValueSpacePublisher dismissRequestPublisher(TsProperty::KTsPath); + dismissRequestPublisher.setValue(TsProperty::KDismissRequestPath, static_cast(false)); + dismissRequestPublisher.sync(); + + // create device dialog dialogInterface = new TsDeviceDialogContainer(mModel); } return dialogInterface;