X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=packageselector.cpp;h=580177e610a27656528eadcb90a905dce1d1c7cd;hb=ab1356a93cb5ba6ff96aac78c6db64cbdc732f80;hp=fcade788b68549eb3f41329008db4a24e48fbab4;hpb=ab39ad0cf5e313e7dc4a0db113e2d0664194281c;p=fapman diff --git a/packageselector.cpp b/packageselector.cpp index fcade78..580177e 100644 --- a/packageselector.cpp +++ b/packageselector.cpp @@ -17,7 +17,7 @@ (C) Heikki Holstila 2010 */ -#include +#include #include #include @@ -29,18 +29,17 @@ #include "blacklistselect.h" #include "aaptinterface.h" #include "settings.h" +#include "mainwindow.h" -PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, QWidget *parent) : +PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, MainWindow* mw, QWidget *parent) : QDialog(parent), - ui(new Ui::PackageSelector) + ui(new Ui::PackageSelector), iNetworkAccessManager(0), iChangelogFetched(false), iFetchInProgress(false) { - ui->setupUi(this); + ui->setupUi(this); iPkg = pkg; iAptInterface = apt; iSettings = set; - iNetworkAccessManager = 0; - iChangelogFetched = false; - iFetchInProgress = false; + iMainWindow = mw; iChangelog = ""; ui->pushButton_website->setIcon(QPixmap("/usr/share/icons/hicolor/48x48/hildon/general_web.png")); @@ -526,6 +525,9 @@ void PackageSelector::queryChangelog() if( iChangelogFetched || iFetchInProgress ) return; + if( iMainWindow ) + iMainWindow->openNetworkConnection(); + iChangelogFetched = false; iFetchInProgress = true; iChangelog = ""; @@ -541,7 +543,7 @@ void PackageSelector::queryChangelog() if( !iNetworkAccessManager ) { iNetworkAccessManager = new QNetworkAccessManager(this); - connect(iNetworkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(changelogFetchNetworkReply(QNetworkReply*))); + connect(iNetworkAccessManager,SIGNAL(finished(QReply*)),this,SLOT(changelogFetchNetworkReply(QReply*))); if( iSettings->qsettings()->value("use_proxies").toBool() && !iSettings->qsettings()->value("http_proxy").toString().isEmpty() ) { @@ -574,7 +576,7 @@ void PackageSelector::changelogFetchNetworkReply(QNetworkReply* reply) qDebug() << "changelog fetched"; } else { - iChangelog = "Not available (Network error)"; + iChangelog = "Not available ( error)"; qDebug() << "changelog fetch error:" << reply->error() << reply->errorString(); }