summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-10 08:08:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-10 08:08:57 +0000
commitf1e9c60cad4f03d6dfa24c8ba41f27d73f2386a4 (patch)
treec28fbb62df6e49b0b2859324f44bc3d4d7aa086c
parent62f474f24066f1400ff57947480d012be1652c68 (diff)
downloadbibletime-f1e9c60cad4f03d6dfa24c8ba41f27d73f2386a4.tar.gz
bibletime-f1e9c60cad4f03d6dfa24c8ba41f27d73f2386a4.zip
Bugfixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1173707 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--bibletime/frontend/btinstallmgr.cpp6
-rw-r--r--bibletime/frontend/btinstallmgr.h2
-rw-r--r--bibletime/frontend/cswordsetupdialog.cpp6
3 files changed, 9 insertions, 5 deletions
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index c3cb859..00f2f4a 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -309,9 +309,9 @@ namespace BookshelfManager {
m_totalBytes = (totalBytes > 0) ? totalBytes : 1; //avoid division by zero
}
-// FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
-// return new KIO_FTPTransport(host, statusReporter);
-// }
+ FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
+ return new KIO_FTPTransport(host, statusReporter);
+ }
}
diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h
index fab0cfd..39549e8 100644
--- a/bibletime/frontend/btinstallmgr.h
+++ b/bibletime/frontend/btinstallmgr.h
@@ -85,7 +85,7 @@ protected:
virtual void statusUpdate(double dltotal, double dlnow);
virtual void preStatus(long totalBytes, long completedBytes, const char *message);
-// virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);
+ virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);
long m_totalBytes;
long m_completedBytes;
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index 7bcde98..a8607e2 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -502,7 +502,7 @@ the module remote installation feature!</b>")
if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
// int errorCode = 0;
if (!m_refreshedRemoteSources) {
- if (!iMgr.refreshRemoteSource( &is ) ) { //make sure the sources were updates sucessfully
+ if (!iMgr.refreshRemoteSource( &is ) ) { //make sure the sources were updated sucessfully
m_refreshedRemoteSources = true;
success = true;
}
@@ -513,6 +513,10 @@ the module remote installation feature!</b>")
}
}
}
+ else {
+ // Local source
+ success = true;
+ }
m_progressDialog->close();
delete m_progressDialog;