Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09 into lp:ubuntu-filemanager-app

Proposed by Carlos Jose Mazieri on 2015-11-08
Status: Merged
Approved by: Arto Jalkanen on 2015-11-10
Approved revision: 499
Merged at revision: 499
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09
Merge into: lp:ubuntu-filemanager-app
Diff against target: 32 lines (+4/-6)
2 files modified
src/plugin/folderlistmodel/disk/disklocation.cpp (+3/-5)
src/plugin/folderlistmodel/smb/smblocationauthentication.cpp (+1/-1)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09
Reviewer Review Type Date Requested Status
Arto Jalkanen 2015-11-08 Approve on 2015-11-10
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-11-08
Jenkins Bot continuous-integration Approve on 2015-11-08
Review via email: mp+276933@code.launchpad.net

Commit message

Removed unnecessary variable pathExists from DiskLocation::isThereDiskSpace()
Improved log for authenticateCallBacks.

Description of the change

Removed unnecessary variable pathExists from DiskLocation::isThereDiskSpace()
Improved log for authenticateCallBacks.

To post a comment you must log in.
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/folderlistmodel/disk/disklocation.cpp'
2--- src/plugin/folderlistmodel/disk/disklocation.cpp 2015-11-02 15:58:50 +0000
3+++ src/plugin/folderlistmodel/disk/disklocation.cpp 2015-11-08 12:33:22 +0000
4@@ -216,12 +216,10 @@
5 {
6 bool ret = true;
7 #if defined(Q_OS_UNIX)
8- QFileInfo info(pathname);
9- bool pathExists = info.exists();
10- while (!pathExists && info.absoluteFilePath() != QDir::rootPath())
11+ QFileInfo info(pathname);
12+ while (!info.exists() && info.absoluteFilePath() != QDir::rootPath())
13 {
14- info.setFile(info.absolutePath());
15- pathExists = info.exists();
16+ info.setFile(info.absolutePath());
17 }
18 struct statvfs vfs;
19 if ( ::statvfs( QFile::encodeName(info.absoluteFilePath()).constData(), &vfs) == 0 )
20
21=== modified file 'src/plugin/folderlistmodel/smb/smblocationauthentication.cpp'
22--- src/plugin/folderlistmodel/smb/smblocationauthentication.cpp 2015-07-15 13:00:56 +0000
23+++ src/plugin/folderlistmodel/smb/smblocationauthentication.cpp 2015-11-08 12:33:22 +0000
24@@ -25,7 +25,7 @@
25 #define GOOD_INDEX() (m_infoIndex >= 0 && m_infoIndex < MAX_AUTH_INSTANCES)
26
27 #if defined(REGRESSION_TEST_FOLDERLISTMODEL) && defined(SIMPLE_UI)
28-# define DEBUG_AUTHENTICATION() qDebug() << Q_FUNC_INFO << user << passwd
29+# define DEBUG_AUTHENTICATION() qDebug() << Q_FUNC_INFO << "user:" << user << "passwd:" << passwd << "server:" << server << "share:" << share
30 #else
31 # define DEBUG_AUTHENTICATION() /**/
32 #endif

Subscribers

People subscribed via source and target branches