[Pkg-owncloud-commits] [owncloud-client] 76/121: fix #5015 overlay icon not show: compare folder paths with no case-sensitivity

[Sandro Knauß]

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 7a2a439426e06c5d028362a45bbb8e4b13bc37d6
Author: arthurchiao <arthurchiao at hotmail.com>
Date:   Fri Jul 1 13:03:42 2016 +0800

    fix #5015 overlay icon not show: compare folder paths with no case-sensitivity
---
 shell_integration/windows/OCOverlays/OCOverlay.cpp | 12 ++++++------
 src/gui/folderman.cpp                              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/shell_integration/windows/OCOverlays/OCOverlay.cpp b/shell_integration/windows/OCOverlays/OCOverlay.cpp
index d8de36c..a5b6938 100644
--- a/shell_integration/windows/OCOverlays/OCOverlay.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlay.cpp
@@ -110,17 +110,17 @@ IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
 	// we order this in terms of likelyhood
 	switch (_state) {
 	case State_OK:
-		*pPriority = 0;
+		*pPriority = 0; break;
 	case State_OKShared:
-		*pPriority = 1;
+		*pPriority = 1; break;
 	case State_Warning:
-		*pPriority = 2;
+		*pPriority = 2; break;
 	case State_Sync:
-		*pPriority = 3;
+		*pPriority = 3; break;
 	case State_Error:
-		*pPriority = 4;
+		*pPriority = 4; break;
 	default:
-		*pPriority = 5;
+		*pPriority = 5; break;
 	}
 
 	return S_OK;
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index d39199e..00c59e8 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -849,7 +849,7 @@ Folder *FolderMan::folderForPath(const QString &path)
     foreach(Folder* folder, this->map().values()) {
         const QString folderPath = folder->cleanPath()+QLatin1Char('/');
 
-        if(absolutePath.startsWith(folderPath)) {
+        if(absolutePath.startsWith(folderPath, Qt::CaseInsensitive)) {
             //qDebug() << "found folder: " << folder->path() << " for " << absolutePath;
             return folder;
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git