[Pkg-owncloud-commits] [owncloud-client] 146/211: SocketAPI: do not have a special case for UPDATE_VIEW on windows
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:39 UTC 2014
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 dc13e39bb17dd2d2c3bb07755c7244e213717db0
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Tue Oct 21 14:57:50 2014 +0200
SocketAPI: do not have a special case for UPDATE_VIEW on windows
This is a relique on the old times when there was no persistant connection
in the windows plugin
---
src/mirall/socketapi.cpp | 6 +-----
src/mirall/utility.cpp | 11 -----------
src/mirall/utility.h | 2 --
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index bf61a49..7014db4 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -253,11 +253,7 @@ void SocketApi::slotUpdateFolderView(const QString& alias)
f->syncResult().status() == SyncResult::Problem ||
f->syncResult().status() == SyncResult::Error ||
f->syncResult().status() == SyncResult::SetupError ) {
- if( Utility::isWindows() ) {
- Utility::winShellChangeNotify( f->path() );
- } else {
- broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
- }
+ broadcastMessage(QLatin1String("UPDATE_VIEW"), f->path() );
} else {
qDebug() << "Not sending UPDATE_VIEW for" << alias << "because status() is" << f->syncResult().status();
}
diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 63d6fee..7f89799 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -372,17 +372,6 @@ bool Utility::isLinux()
#endif
}
-void Utility::winShellChangeNotify( const QString& path )
-{
-#ifdef Q_OS_WIN
- SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT,
- reinterpret_cast<const wchar_t *>(QDir::toNativeSeparators(path).utf16()), NULL );
-#else
- Q_UNUSED(path);
- qDebug() << Q_FUNC_INFO << " is not implemented on non Windows systems.";
-#endif
-}
-
static const char STOPWATCH_END_TAG[] = "_STOPWATCH_END";
diff --git a/src/mirall/utility.h b/src/mirall/utility.h
index 32eab30..8787422 100644
--- a/src/mirall/utility.h
+++ b/src/mirall/utility.h
@@ -63,8 +63,6 @@ namespace Utility
OWNCLOUDSYNC_EXPORT QDateTime qDateTimeFromTime_t(qint64 t);
OWNCLOUDSYNC_EXPORT qint64 qDateTimeToTime_t(const QDateTime &t);
- OWNCLOUDSYNC_EXPORT void winShellChangeNotify( const QString& path );
-
/**
* @brief Convert milliseconds to HMS string.
* @param quint64 msecs the milliseconds to convert to string.
--
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