diff -r ba76fc04e6c2 -r 6b911d05207e phoneengine/networkhandlingstarter/src/networkhandlingstarter_p.cpp --- a/phoneengine/networkhandlingstarter/src/networkhandlingstarter_p.cpp Fri Jun 04 10:19:18 2010 +0100 +++ b/phoneengine/networkhandlingstarter/src/networkhandlingstarter_p.cpp Wed Jun 23 18:12:20 2010 +0300 @@ -16,11 +16,12 @@ */ #include -#include -#include +#include +#include #include -#include +#include #include +#include #include "networkhandlingstarter_p.h" #include "networkhandlingstarterlogging.h" @@ -101,29 +102,27 @@ /*! NetworkHandlingStarterPrivate::InitaliseCpNetworkPluginView() */ -void NetworkHandlingStarterPrivate::InitaliseCpNetworkPluginView() +bool NetworkHandlingStarterPrivate::InitaliseCpNetworkPluginView() { DPRINT << ": IN"; - HbMainWindow *mainWnd = MainWindow(); - if (mainWnd) { - if (CpPluginLauncher::launchCpPluginView( - "resource\\qt\\plugins\\controlpanel\\cpnetworkplugin.qtplugin")) { - foreach (HbView *view, mainWnd->views()) { - if (QString(view->metaObject()->className()) == - QString("CpNetworkPluginView")) { - QObject::connect( - view, SIGNAL(aboutToClose()), - this, SLOT(ViewDone())); - QObject::connect( - this, SIGNAL(SearchAvailableNetworks()), - view, SLOT(SearchAvailableNetworks())); - } - } + bool ok(false); + CpBaseSettingView* view = CpPluginLauncher::launchSettingView("cpnetworkplugin"); + if (view) { + if (QString(view->metaObject()->className()) == + QString("CpNetworkPluginView")) { + QObject::connect( + view, SIGNAL(aboutToClose()), + this, SLOT(ViewDone())); + QObject::connect( + this, SIGNAL(SearchAvailableNetworks()), + view, SLOT(SearchAvailableNetworks())); + ok = true; } } DPRINT << ": OUT"; + return ok; } /*! @@ -133,13 +132,15 @@ { DPRINT << ": IN"; - InitaliseCpNetworkPluginView(); - HbMainWindow *mainWnd = MainWindow(); - if (mainWnd) { - mainWnd->show(); - XQServiceUtil::toBackground(false); + if (InitaliseCpNetworkPluginView()) { + DPRINT << ": Show network settings view"; + HbMainWindow *mainWnd = MainWindow(); + if (mainWnd) { + mainWnd->show(); + XQServiceUtil::toBackground(false); + } + emit SearchAvailableNetworks(); } - emit SearchAvailableNetworks(); DPRINT << ": OUT"; }