diff options
Diffstat (limited to 'deskutils/owncloudclient/files')
4 files changed, 15 insertions, 15 deletions
diff --git a/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp b/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp index 94fae0c3faea..a279b76059e6 100644 --- a/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp +++ b/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp @@ -1,8 +1,8 @@ ---- src/gui/accountsettings.cpp.orig 2015-03-16 14:28:58 UTC +--- src/gui/accountsettings.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/accountsettings.cpp -@@ -30,7 +30,8 @@ - #include "selectivesyncdialog.h" +@@ -31,7 +31,8 @@ #include "creds/abstractcredentials.h" + #include "tooltipupdater.h" -#include <math.h> +#include <climits> diff --git a/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp b/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp index 413d71f68946..f3fc7d46d546 100644 --- a/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp +++ b/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp @@ -1,14 +1,14 @@ ---- src/gui/generalsettings.cpp.orig 2015-09-01 13:50:21 UTC +--- src/gui/generalsettings.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/generalsettings.cpp -@@ -105,6 +105,7 @@ void GeneralSettings::loadMiscSettings() +@@ -109,6 +109,7 @@ void GeneralSettings::loadMiscSettings() void GeneralSettings::slotUpdateInfo() { +#if 0 - 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); -@@ -112,9 +113,12 @@ void GeneralSettings::slotUpdateInfo() + OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance()); + if (ConfigFile().skipUpdateCheck()) { + updater = 0; // don't show update info if updates are disabled +@@ -121,9 +122,12 @@ void GeneralSettings::slotUpdateInfo() _ui->updateStateLabel->setText(updater->statusString()); _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete); } else { diff --git a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp index 09019a86b3f3..5c177ddf55d8 100644 --- a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp +++ b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp @@ -1,11 +1,11 @@ ---- src/gui/owncloudgui.cpp.orig 2015-03-16 14:28:58 UTC +--- src/gui/owncloudgui.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/owncloudgui.cpp -@@ -33,6 +33,8 @@ - #include "openfilemanager.h" +@@ -34,6 +34,8 @@ + #include "accountmanager.h" #include "creds/abstractcredentials.h" +#include <climits> + #include <QDesktopServices> + #include <QDir> #include <QMessageBox> - #include <QSignalMapper> diff --git a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp index 574696b405e0..ff8edf05c12d 100644 --- a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp +++ b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp @@ -1,6 +1,6 @@ ---- src/libsync/configfile.cpp.orig 2015-03-16 14:28:58 UTC +--- src/libsync/configfile.cpp.orig 2016-05-12 07:59:12 UTC +++ src/libsync/configfile.cpp -@@ -383,11 +383,22 @@ bool ConfigFile::skipUpdateCheck( const +@@ -415,11 +415,22 @@ bool ConfigFile::skipUpdateCheck( const QString con( connection ); if( connection.isEmpty() ) con = defaultConnection(); |