diff options
author | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-03-05 08:20:55 +0100 |
---|---|---|
committer | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-03-05 08:20:55 +0100 |
commit | ded89dcf51dac5f82f52a97757ae40c8ffce737d (patch) | |
tree | 11cff92c97543770126d943107156993f3e2c8a4 /browser/browser.cpp | |
parent | 9c04c2c5312784ddc72c566b9b2d23aa1d4ef1de (diff) | |
download | browser-poc-ded89dcf51dac5f82f52a97757ae40c8ffce737d.tar.gz |
Moved INetworkManager from IWebPageWindow to IBrowser
Diffstat (limited to 'browser/browser.cpp')
-rw-r--r-- | browser/browser.cpp | 10 |
1 files changed, 2 insertions, 8 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; } |