[Pkg-owncloud-commits] [owncloud-client] 465/498: Merge branch 'master' into linux_restart_on_new_version
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 72b2c52e15a5f0b0d901b82d07fe2935790d4ee6
Merge: 2a22cec 6e32c2c
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Thu Aug 6 11:11:52 2015 +0200
Merge branch 'master' into linux_restart_on_new_version
Conflicts:
src/gui/application.cpp
src/gui/owncloudsetupwizard.cpp
.gitmodules | 2 +-
CMakeLists.txt | 5 +
admin/osx/macosx.pkgproj | 4 +-
admin/osx/post_install.sh.cmake | 8 +
admin/win/nsi/l10n/Basque.nsh | 5 -
admin/win/nsi/l10n/Catalan.nsh | 5 -
admin/win/nsi/l10n/Czech.nsh | 5 -
admin/win/nsi/l10n/Dutch.nsh | 5 -
admin/win/nsi/l10n/English.nsh | 6 +-
admin/win/nsi/l10n/Estonian.nsh | 5 -
admin/win/nsi/l10n/Farsi.nsh | 5 -
admin/win/nsi/l10n/Finnish.nsh | 5 -
admin/win/nsi/l10n/French.nsh | 5 -
admin/win/nsi/l10n/Galician.nsh | 5 -
admin/win/nsi/l10n/German.nsh | 5 -
admin/win/nsi/l10n/Greek.nsh | 5 -
admin/win/nsi/l10n/Hungarian.nsh | 5 -
admin/win/nsi/l10n/Italian.nsh | 5 -
admin/win/nsi/l10n/Japanese.nsh | 5 -
admin/win/nsi/l10n/Norwegian.nsh | 5 -
admin/win/nsi/l10n/Polish.nsh | 5 -
admin/win/nsi/l10n/Portuguese.nsh | 5 -
admin/win/nsi/l10n/PortugueseBR.nsh | 5 -
admin/win/nsi/l10n/Russian.nsh | 5 -
admin/win/nsi/l10n/SimpChinese.nsh | 5 -
admin/win/nsi/l10n/Slovak.nsh | 5 -
admin/win/nsi/l10n/Slovenian.nsh | 5 -
admin/win/nsi/l10n/Spanish.nsh | 5 -
admin/win/nsi/l10n/SpanishInternational.nsh | 5 -
admin/win/nsi/l10n/Swedish.nsh | 5 -
admin/win/nsi/l10n/Thai.nsh | 5 -
admin/win/nsi/l10n/Turkish.nsh | 5 -
admin/win/nsi/l10n/Ukrainian.nsh | 5 -
admin/win/nsi/l10n/bin/l10n.sh | 4 +-
admin/win/nsi/l10n/declarations.nsh | 6 +-
admin/win/nsi/l10n/pofiles/messages.pot | 22 +-
cmake/modules/NSIS.template.in | 145 +--
config.h.in | 2 +-
csync/config_csync.h.cmake | 1 -
csync/src/csync.c | 4 +
csync/src/csync.h | 62 +-
csync/src/csync_exclude.h | 3 +-
csync/src/csync_private.h | 4 +-
csync/src/csync_reconcile.c | 13 +-
csync/src/csync_statedb.c | 5 +-
csync/src/csync_update.c | 100 +-
csync/src/vio/csync_vio_local_unix.c | 8 +-
csync/src/vio/csync_vio_local_win.c | 7 +-
csync/tests/vio_tests/check_vio_ext.c | 101 +-
shell_integration/nautilus/syncstate.py | 26 +-
src/cmd/cmd.cpp | 14 +-
src/gui/CMakeLists.txt | 7 +-
src/gui/accountmanager.cpp | 13 +-
src/gui/accountmanager.h | 6 +
src/gui/accountsettings.cpp | 37 +-
src/gui/accountsettings.h | 2 +
src/gui/accountsettings.ui | 3 +
src/gui/accountstate.cpp | 16 +
src/gui/accountstate.h | 3 +
src/gui/application.cpp | 21 +-
src/gui/application.h | 1 -
src/gui/creds/httpcredentialsgui.cpp | 23 +-
src/gui/creds/httpcredentialsgui.h | 2 +-
src/gui/folder.cpp | 48 +-
src/gui/folder.h | 15 +-
src/gui/folderman.cpp | 31 +-
src/gui/folderman.h | 4 +-
src/gui/folderstatusmodel.cpp | 48 +-
src/gui/folderstatusmodel.h | 4 +-
src/gui/folderwatcher.cpp | 25 +-
src/gui/folderwatcher.h | 5 +
src/gui/generalsettings.cpp | 11 +-
src/gui/generalsettings.h | 1 +
src/gui/generalsettings.ui | 5 +-
src/gui/ignorelisteditor.cpp | 23 +
src/gui/ignorelisteditor.h | 2 +
src/gui/ignorelisteditor.ui | 177 ++--
src/gui/main.cpp | 5 +
src/gui/networksettings.cpp | 14 +-
src/gui/networksettings.h | 1 +
src/gui/networksettings.ui | 17 +-
src/gui/owncloudgui.cpp | 2 +-
src/gui/owncloudgui.h | 2 +
src/gui/owncloudsetupwizard.cpp | 6 +-
src/gui/protocolwidget.h | 2 +
src/gui/proxyauthdialog.cpp | 53 +
src/gui/proxyauthdialog.h | 52 +
src/gui/proxyauthdialog.ui | 115 +++
src/gui/proxyauthhandler.cpp | 263 +++++
src/gui/proxyauthhandler.h | 112 +++
src/gui/settingsdialog.cpp | 11 +-
src/gui/settingsdialogmac.cpp | 5 +-
src/gui/sharedialog.cpp | 73 +-
src/gui/sharedialog.h | 15 +
src/gui/socketapi.cpp | 7 +
src/gui/sslbutton.cpp | 13 +-
src/gui/updater/ocupdater.cpp | 93 +-
src/gui/updater/ocupdater.h | 61 +-
src/gui/updater/sparkleupdater_mac.mm | 2 +-
src/gui/updater/updater.cpp | 6 +
src/gui/updater/updater.h | 2 +
src/libsync/CMakeLists.txt | 1 +
src/libsync/abstractnetworkjob.cpp | 3 +-
src/libsync/accessmanager.cpp | 19 +-
src/libsync/accessmanager.h | 2 -
src/libsync/account.cpp | 16 +-
src/libsync/account.h | 11 +-
src/libsync/capabilities.cpp | 41 +
src/libsync/capabilities.h | 44 +
src/libsync/configfile.cpp | 38 +-
src/libsync/configfile.h | 14 +-
src/libsync/creds/httpcredentials.cpp | 17 +-
src/libsync/creds/httpcredentials.h | 2 +-
src/libsync/discoveryphase.cpp | 27 +-
src/libsync/discoveryphase.h | 12 +-
src/libsync/filesystem.cpp | 3 +
src/libsync/networkjobs.cpp | 11 +-
src/libsync/networkjobs.h | 1 +
src/libsync/propagatedownload.cpp | 15 +-
src/libsync/propagateupload.cpp | 2 +
src/libsync/syncengine.cpp | 38 +-
src/libsync/syncengine.h | 12 +-
src/libsync/syncfileitem.h | 3 +-
src/libsync/syncjournaldb.cpp | 20 +-
src/libsync/syncjournalfilerecord.cpp | 4 +-
src/libsync/syncjournalfilerecord.h | 11 +-
src/libsync/theme.cpp | 7 +
src/libsync/theme.h | 7 +
src/libsync/utility.cpp | 20 +-
sync-exclude.lst | 5 +-
test/CMakeLists.txt | 14 +
test/owncloud_add_test.cmake | 2 +-
test/stub.cpp | 1 +
test/testfolderman.h | 35 +-
test/testutility.h | 37 +-
translations/client_ca.ts | 1321 +++++++++++++++----------
translations/client_cs.ts | 1328 +++++++++++++++----------
translations/client_de.ts | 1325 +++++++++++++++----------
translations/client_el.ts | 1332 +++++++++++++++----------
translations/client_en.ts | 1217 ++++++++++++++---------
translations/client_es.ts | 1330 +++++++++++++++----------
translations/client_es_AR.ts | 1291 ++++++++++++++----------
translations/client_et.ts | 1399 ++++++++++++++++-----------
translations/client_eu.ts | 1307 +++++++++++++++----------
translations/client_fa.ts | 1251 ++++++++++++++----------
translations/client_fi.ts | 1310 +++++++++++++++----------
translations/client_fr.ts | 1331 +++++++++++++++----------
translations/client_gl.ts | 1332 +++++++++++++++----------
translations/client_hu.ts | 1261 ++++++++++++++----------
translations/client_it.ts | 1332 +++++++++++++++----------
translations/client_ja.ts | 1371 +++++++++++++++-----------
translations/client_nb_NO.ts | 1329 +++++++++++++++----------
translations/client_nl.ts | 1325 +++++++++++++++----------
translations/client_pl.ts | 1321 +++++++++++++++----------
translations/client_pt.ts | 1325 +++++++++++++++----------
translations/client_pt_BR.ts | 1329 +++++++++++++++----------
translations/client_ru.ts | 1325 +++++++++++++++----------
translations/client_sk.ts | 1325 +++++++++++++++----------
translations/client_sl.ts | 1323 +++++++++++++++----------
translations/client_sr.ts | 1325 +++++++++++++++----------
translations/client_sv.ts | 1313 +++++++++++++++----------
translations/client_th.ts | 1321 +++++++++++++++----------
translations/client_tr.ts | 1325 +++++++++++++++----------
translations/client_uk.ts | 1325 +++++++++++++++----------
translations/client_zh_CN.ts | 1327 +++++++++++++++----------
translations/client_zh_TW.ts | 1279 ++++++++++++++----------
166 files changed, 26437 insertions(+), 17070 deletions(-)
diff --cc src/gui/application.cpp
index a494e56,34eb533..3a777fe
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@@ -168,19 -166,14 +167,19 @@@ Application::Application(int &argc, cha
// Also check immediatly
QTimer::singleShot( 0, this, SLOT( slotCheckConnection() ));
- if( cfg.skipUpdateCheck() ) {
- qDebug() << Q_FUNC_INFO << "Skipping update check";
- } else {
- QTimer::singleShot( 3000, this, SLOT( slotStartUpdateDetector() ));
- }
+ // Update checks
+ UpdaterScheduler *updaterScheduler = new UpdaterScheduler(this);
+ connect(updaterScheduler, SIGNAL(updaterAnnouncement(QString, QString)),
+ _gui, SLOT(slotShowTrayMessage(QString, QString)));
+ // Cleanup at Quit.
connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
+ // remember the version of the currently running binary. On Linux it might happen that the
+ // package management updates the package while the app is running. This is detected in the
+ // updater slot: If the installed binary on the hd has a different version than the one
+ // running, the running app is restart. That happens in folderman.
+ _runningAppVersion = Utility::versionOfInstalledBinary();
}
Application::~Application()
@@@ -218,22 -211,6 +217,16 @@@ void Application::slotCleanup(
_gui->deleteLater();
}
- void Application::slotStartUpdateDetector()
- {
- Updater *updater = Updater::instance();
- updater->backgroundCheckForUpdate();
+
+ if( Utility::isLinux() ) {
+ // on linux, check if the installed binary is still the same version
+ // as the one that is running. If not, restart if possible.
+ const QByteArray fsVersion = Utility::versionOfInstalledBinary();
+
+ if( !(fsVersion.isEmpty() || _runningAppVersion.isEmpty()) && fsVersion != _runningAppVersion ) {
+ _folderManager->slotScheduleAppRestart();
+ }
+ }
- }
-
void Application::slotCheckConnection()
{
auto list = AccountManager::instance()->accounts();
--
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