diff -r 03849bd79877 -r fdbfe0a95492 devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp --- a/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp Fri Sep 17 19:58:05 2010 +0530 +++ b/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp Fri Oct 15 11:39:02 2010 +0530 @@ -27,6 +27,8 @@ #include "pnputillogger.h" #include "omacppinquerydialog.h" #include "devicemanagementnotifierwidget_p.h" +#include "fotadevicedialogs.h" + enum TSyncmlHbNotifierKeys { @@ -46,6 +48,7 @@ QVariantMap::const_iterator i = parameters.constBegin(); int notifiertolaunch = 0; + int dialogtype = 0; while (i != parameters.constEnd()) { if (i.key().toAscii() == "syncmlfw") @@ -53,7 +56,15 @@ notifiertolaunch = i.value().toInt(); // profileidenabled = true; + } + + if (i.key().toAscii() == keydialog) + { + + dialogtype = i.value().toInt(); + // profileidenabled = true; } + ++i; } if(notifiertolaunch == 1000001 )// Connecting dialog @@ -61,15 +72,24 @@ connectDialog = new syncmlConnectNotifier(ptr); connectDialog->launchDialog(parameters); notifier = NULL; + fotadialog = NULL; } - + else if (dialogtype >= EFwDLNeedMoreMemory && dialogtype <= EFwUpdResumeUpdate) + { + fotadialog = new fotadevicedialogs(ptr); + fotadialog->launchFotaDialog(parameters); + connectDialog = NULL; + notifier = NULL; + //return fotadialog; + } else { notifier = new syncmlnotifier(ptr); notifier->launchDialog(parameters); connectDialog = NULL; + fotadialog = NULL; } - } + } devicemanagementnotifierutils::~devicemanagementnotifierutils() { qDebug("devicemanagementnotifierutils::~devicemanagementnotifierutils");