[Pkg-owncloud-commits] [owncloud-client] 19/26: Imported Upstream version 1.5.0~beta2+dfsg
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Dec 9 00:01:59 UTC 2013
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 61e5d2a198dbf98cd28b1b2fb7f7536180a4cdcd
Merge: 0da5734 046d180
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Sun Dec 8 22:08:14 2013 +0100
Imported Upstream version 1.5.0~beta2+dfsg
.tag | 2 +-
VERSION.cmake | 2 +-
cmake/modules/NSIS.template.in | 2 -
doc/building.rst | 2 +-
src/CMakeLists.txt | 4 +-
src/main.cpp | 2 +-
src/mirall/accountsettings.cpp | 4 +-
src/mirall/application.cpp | 11 +-
src/mirall/csyncthread.cpp | 51 ++--
src/mirall/folder.cpp | 10 +
src/mirall/folder.h | 3 +
src/mirall/folderman.cpp | 5 +-
src/mirall/owncloudgui.cpp | 16 +-
src/mirall/owncloudgui.h | 2 +
src/mirall/owncloudpropagator.cpp | 31 ++-
src/mirall/owncloudsetuppage_ng.ui | 478 -----------------------------------
src/mirall/protocolwidget.cpp | 57 ++++-
src/mirall/protocolwidget.h | 10 +-
src/mirall/settingsdialog.cpp | 7 +
src/mirall/settingsdialog.h | 1 +
src/mirall/syncjournaldb.cpp | 36 ++-
src/mirall/syncjournaldb.h | 3 +
src/mirall/syncjournalfilerecord.cpp | 10 +-
src/mirall/syncresult.cpp | 2 +-
src/mirall/theme.cpp | 2 +-
src/mirall/updatedetector.cpp | 2 +-
src/mirall/utility.cpp | 2 +-
translations/mirall_ca.ts | 118 +++++----
translations/mirall_cs.ts | 152 +++++------
translations/mirall_de.ts | 126 ++++-----
translations/mirall_el.ts | 118 +++++----
translations/mirall_en.ts | 116 +++++----
translations/mirall_es.ts | 174 +++++++------
translations/mirall_es_AR.ts | 118 +++++----
translations/mirall_et.ts | 136 +++++-----
translations/mirall_eu.ts | 118 +++++----
translations/mirall_fa.ts | 118 +++++----
translations/mirall_fi.ts | 190 +++++++-------
translations/mirall_fr.ts | 167 ++++++------
translations/mirall_gl.ts | 126 ++++-----
translations/mirall_hu.ts | 118 +++++----
translations/mirall_it.ts | 120 +++++----
translations/mirall_ja.ts | 202 ++++++++-------
translations/mirall_nl.ts | 185 +++++++-------
translations/mirall_pl.ts | 118 +++++----
translations/mirall_pt.ts | 118 +++++----
translations/mirall_pt_BR.ts | 126 ++++-----
translations/mirall_ru.ts | 164 ++++++------
translations/mirall_sk.ts | 211 ++++++++--------
translations/mirall_sl.ts | 223 ++++++++--------
translations/mirall_sv.ts | 118 +++++----
translations/mirall_th.ts | 116 +++++----
translations/mirall_uk.ts | 118 +++++----
translations/mirall_zh_CN.ts | 118 +++++----
translations/mirall_zh_TW.ts | 118 +++++----
55 files changed, 2320 insertions(+), 2387 deletions(-)
diff --cc .tag
index ca43442,6828f88..693fe61
--- a/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 951ac79a68b652331654346f06a83715bb3810ad
-$Format:%H$
++b3620e320be0966d2ead91088da51da3c75437dd
diff --cc src/main.cpp
index 7572955,7572955..3389072
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -36,7 -36,7 +36,7 @@@ int main(int argc, char **argv
Mirall::Application app(argc, argv);
app.initialize();
--#ifndef Q_OS_WIN32
++#ifndef Q_OS_WIN
signal(SIGPIPE, SIG_IGN);
#endif
if( app.giveHelp() ) {
diff --cc src/mirall/accountsettings.cpp
index eb254c5,eb254c5..fd6074e
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@@ -390,7 -390,7 +390,7 @@@ void AccountSettings::slotFolderOpenAct
QUrl url(f->path(), QUrl::TolerantMode);
url.setScheme( QLatin1String("file") );
--#ifdef Q_OS_WIN32
++#ifdef Q_OS_WIN
// work around a bug in QDesktopServices on Win32, see i-net
QString filePath = f->path();
@@@ -490,7 -490,7 +490,7 @@@ void AccountSettings::slotUpdateFolderS
//void AccountSettings::slotOCInfo( const QString& url, const QString& versionStr, const QString& version, const QString& )
//{
--//#ifdef Q_OS_WIN32
++//#ifdef Q_OS_WIN
// // work around a bug in QDesktopServices on Win32, see i-net
// QString filePath = url;
diff --cc src/mirall/application.cpp
index 07b07a6,c1435ca..7dfbb32
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@@ -69,7 -69,7 +69,7 @@@ QString applicationTrPath(
#ifdef Q_OS_MAC
return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
#endif
--#ifdef Q_OS_WIN32
++#ifdef Q_OS_WIN
return QApplication::applicationDirPath();
#endif
}
diff --cc src/mirall/owncloudgui.cpp
index 5c57490,770ed38..ad10da2
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@@ -329,7 -326,7 +326,7 @@@ void ownCloudGui::slotFolderOpenAction
QUrl url(f->path(), QUrl::TolerantMode);
url.setScheme( QLatin1String("file") );
--#ifdef Q_OS_WIN32
++#ifdef Q_OS_WIN
// work around a bug in QDesktopServices on Win32, see i-net
QString filePath = f->path();
diff --cc src/mirall/owncloudpropagator.cpp
index 92b10fb,238681f..a8683d9
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@@ -41,6 -41,6 +41,11 @@@
#include <time.h>
++#ifdef Q_OS_WIN
++#include <windef.h>
++#include <winbase.h>
++#endif
++
// We use some internals of csync:
extern "C" int c_utimes(const char *, const struct timeval *);
extern "C" void csync_win32_set_file_hidden( const char *file, bool h );
@@@ -333,7 -333,7 +338,7 @@@ void PropagateUploadFile::start(
state = hbf_splitlist(trans.data(), file.handle());
if (progressInfo._valid) {
-- if (progressInfo._modtime.toTime_t() == _item._modtime) {
++ if (progressInfo._modtime.toTime_t() == (uint)_item._modtime) {
trans->start_id = progressInfo._chunk;
trans->transfer_id = progressInfo._transferid;
}
@@@ -782,7 -786,7 +791,7 @@@ void PropagateDownloadFile::start(
csync_win32_set_file_hidden(tmpFileName.toUtf8().constData(), false);
--#ifndef QT_OS_WIN
++#ifndef Q_OS_WIN
bool success;
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
success = tmpFile.fileEngine()->rename(fn);
@@@ -800,10 -804,10 +809,12 @@@
done(SyncFileItem::NormalError, tmpFile.errorString());
return;
}
--#else //QT_OS_WIN
-- if (::MoveFileEx((wchar_t*)tmpFile.fileName().utf16(),
-- (wchar_t*)QString(_localDir + item._file).utf16(),
-- MOVEFILE_REPLACE_EXISTING) != 0) {
++#else //Q_OS_WIN
++ BOOL ok;
++ ok = MoveFileEx((wchar_t*)tmpFile.fileName().utf16(),
++ (wchar_t*)QString(_propagator->_localDir + _item._file).utf16(),
++ MOVEFILE_REPLACE_EXISTING+MOVEFILE_COPY_ALLOWED+MOVEFILE_WRITE_THROUGH);
++ if (!ok) {
wchar_t *string = 0;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, ::GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
diff --cc src/mirall/updatedetector.cpp
index 82376df,82376df..42be36d
--- a/src/mirall/updatedetector.cpp
+++ b/src/mirall/updatedetector.cpp
@@@ -48,7 -48,7 +48,7 @@@ void UpdateDetector::versionCheck( Them
#ifdef Q_OS_LINUX
platform = QLatin1String("linux");
#endif
--#ifdef Q_OS_WIN32
++#ifdef Q_OS_WIN
platform = QLatin1String( "win32" );
#endif
#ifdef Q_OS_MAC
diff --cc src/mirall/utility.cpp
index 7916127,7916127..c23152f
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@@ -104,7 -104,7 +104,7 @@@ QString Utility::octetsToString( qint6
// Qtified version of get_platforms() in csync_owncloud.c
QString Utility::platform()
{
--#if defined(Q_OS_WIN32)
++#if defined(Q_OS_WIN)
return QLatin1String("Windows");
#elif defined(Q_OS_MAC)
return QLatin1String("Macintosh");
--
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