[Pkg-owncloud-commits] [owncloud-client] 01/01: Remove update frame
David Prévot
taffit at moszumanska.debian.org
Wed Feb 26 17:12:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-client.
commit b9f7b10139251062ec2d479dd15edc9bcae56d0e
Author: David Prévot <taffit at debian.org>
Date: Wed Feb 26 12:05:48 2014 -0400
Remove update frame
Providing a Debian-specific and English-only explanation in the UI is
not nice for our derivatives or non-English speaking users.
Git-Dch: ignore
---
debian/patches/0001-disable-updatecheck.patch | 33 ++++++++++++++++-----------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index 90cb152..c746df1 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -26,16 +26,23 @@ Index: owncloud-client/src/mirall/mirallconfigfile.cpp
}
void MirallConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
-Index: owncloud-client/src/updater/ocupdater.cpp
-===================================================================
---- owncloud-client.orig/src/updater/ocupdater.cpp 2014-02-25 11:25:40.889067403 +0100
-+++ owncloud-client/src/updater/ocupdater.cpp 2014-02-25 11:25:40.879067312 +0100
-@@ -84,7 +84,7 @@
- case UpdateOnlyAvailableThroughSystem:
- return tr("New version %1 available. Please use the systems update tool to install it.").arg(updateVersion);
- case Unknown:
-- return tr("Checking update server...");
-+ return tr("Disabled for Debian. You hve to use your package management to update.");
- case UpToDate:
- // fall through
- default:
+--- a/src/mirall/generalsettings.cpp
++++ b/src/mirall/generalsettings.cpp
+@@ -76,17 +76,7 @@
+
+ void GeneralSettings::slotUpdateInfo()
+ {
+- if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance()))
+- {
+- connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
+- connect(_ui->restartButton, SIGNAL(clicked()), updater, SLOT(slotStartInstaller()), Qt::UniqueConnection);
+- connect(_ui->restartButton, SIGNAL(clicked()), qApp, SLOT(quit()), Qt::UniqueConnection);
+- _ui->updateStateLabel->setText(updater->statusString());
+- _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
+- } else {
+- // can't have those infos from sparkle currently
+ _ui->updatesGroupBox->setVisible(false);
+- }
+ }
+
+ void GeneralSettings::saveMiscSettings()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list