summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-03 00:50:01 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-03 00:50:01 +0200
commitf4b0e316c3da6b4f1693d645cd62bdb57fe2b6c2 (patch)
tree86282c2f8bce481e4c5bf396a9c5357678930788 /rbutil/rbutilqt/rbutilqt.cpp
parentb73c9616830df6337c0c426ca0e4e1a6cd54cdf6 (diff)
downloadrockbox-f4b0e316c3da6b4f1693d645cd62bdb57fe2b6c2.tar.gz
rockbox-f4b0e316c3da6b4f1693d645cd62bdb57fe2b6c2.tar.bz2
rockbox-f4b0e316c3da6b4f1693d645cd62bdb57fe2b6c2.zip
Update for single build-info file.
The server now provides a single build-info file (instead of two separate ones for development builds and stable releases). Update to use the new file, since it simplifies things. Change-Id: If3b949f4d78eecb54e47622da887f51005f6d155
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp41
1 files changed, 6 insertions, 35 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 9c72f13d05..279b73b5be 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -227,7 +227,7 @@ void RbUtilQt::downloadInfo()
ui.statusbar->showMessage(tr("Downloading build information, please wait ..."));
qDebug() << "[RbUtil] downloading build info";
daily->setFile(&buildInfo);
- daily->getFile(QUrl(SystemInfo::value(SystemInfo::ServerConfUrl).toString()));
+ daily->getFile(QUrl(SystemInfo::value(SystemInfo::BuildInfoUrl).toString()));
}
@@ -249,42 +249,13 @@ void RbUtilQt::downloadDone(bool error)
ServerInfo::readBuildInfo(buildInfo.fileName());
buildInfo.close();
- // start bleeding info download
- bleeding = new HttpGet(this);
- connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool)));
- connect(qApp, SIGNAL(lastWindowClosed()), bleeding, SLOT(abort()));
- if(RbSettings::value(RbSettings::CacheOffline).toBool())
- bleeding->setCache(true);
- bleeding->setFile(&bleedingInfo);
- bleeding->getFile(QUrl(SystemInfo::value(SystemInfo::BleedingInfo).toString()));
- ui.statusbar->showMessage(tr("Downloading build information, please wait ..."));
-
-}
-
-
-void RbUtilQt::downloadBleedingDone(bool error)
-{
- if(error) {
- qDebug() << "[RbUtil] network error:" << bleeding->error();
- ui.statusbar->showMessage(tr("Can't get version information!"));
- QMessageBox::critical(this, tr("Network error"),
- tr("Can't get version information.\n"
- "Network error: %1. Please check your network and proxy settings.")
- .arg(bleeding->errorString()));
- return;
- }
- else {
- bleedingInfo.open();
- ServerInfo::readBleedingInfo(bleedingInfo.fileName());
- bleedingInfo.close();
+ ui.statusbar->showMessage(tr("Download build information finished."), 5000);
+ updateSettings();
+ m_gotInfo = true;
- ui.statusbar->showMessage(tr("Download build information finished."), 5000);
- updateSettings();
- m_gotInfo = true;
+ //start check for updates
+ checkUpdate();
- //start check for updates
- checkUpdate();
- }
}