Moved INetworkManager from IWebPageWindow to IBrowser

3 files changed, 7 insertions, 9 deletions

diff --git a/browser/browser.cpp b/browser/browser.cpp
index a16ba44..d681d31 100644
--- a/browser/browser.cpp
+++ b/browser/browser.cpp
@@ -64,12 +64,13 @@ conn::brw::ERROR_IDS browser::createPageWindow(int a_eDeviceId, const conn::brw:
             m_userInput, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool)));
     connect(m_userInput, SIGNAL(selectIndexes(QList<int>)), bvi, SLOT(onSelectIndexes(QList<int>)));
 
+    QDBusConnection conn = connection();
+
     QString *webpagewindowservice = new QString("/Browser/IWebPageWindow" + QString::number(a_hPageWindowHandle));
     qDebug() << *webpagewindowservice;
 
     webviewhash.insert(*webpagewindowservice, bvi);
 
-    QDBusConnection conn = connection();
     if(!conn.registerObject(*webpagewindowservice, wpw)) {
         qDebug() << "failed register object IWebPageWindow";
         exit(1);
@@ -82,13 +83,6 @@ conn::brw::ERROR_IDS browser::createPageWindow(int a_eDeviceId, const conn::brw:
         exit(1);
     }
 
-    QString *networkmanagerservice = new QString( *webpagewindowservice + "/INetworkManager");
-    qDebug() << *networkmanagerservice;
-    if(!conn.registerObject(*networkmanagerservice, m_networkManager)) {
-        qDebug() << "failed register object INetworkManager";
-        exit(1);
-    }
-
     emit onPageWindowCreated(a_hPageWindowHandle, conn::brw::EID_NO_ERROR);
     return conn::brw::EID_NO_ERROR;
 }
diff --git a/browser/browserhelper.cpp b/browser/browserhelper.cpp
index 9036f84..72688ca 100644
--- a/browser/browserhelper.cpp
+++ b/browser/browserhelper.cpp
@@ -61,6 +61,10 @@ browserhelper::browserhelper(QString instanceId, QObject *parent) :
 
     networkmanager *nm = new networkmanager(cm->getNetworkAccessManager());
     new INetworkManagerAdaptor(nm);
+    if(!connection->registerObject("/Browser/INetworkManager", nm)) {
+        qDebug() << "failed register object INetworkManager";
+        exit(1);
+    }
 
     browser *br = new browser(cm, ui, nm);
     new IBrowserAdaptor(br);
diff --git a/common/browserdbus.cpp b/common/browserdbus.cpp
index df81f39..2cf8967 100644
--- a/common/browserdbus.cpp
+++ b/common/browserdbus.cpp
@@ -231,7 +231,7 @@ void BrowserDbus::createPageWindow(int deviceid, int x, int y, int width, int he
 
         connect(actualuserinput, SIGNAL(onInputText(QString,QString,conn::brw::INPUT_ELEMENT_TYPE,int,int,int,int)), this, SLOT(InputTextReceived(QString,QString,conn::brw::INPUT_ELEMENT_TYPE,int,int,int,int)));
 
-        QString *networkmanagerservice = new QString(*webpagewindowservice + "/INetworkManager");
+        QString *networkmanagerservice = new QString("/Browser/INetworkManager");
 
         networkmanager = new conn::brw::INetworkManager(*dbusservicename, *networkmanagerservice,
                                               QDBusConnection::sessionBus(), this);