Carlos Jose Mazieri has proposed merging
lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09 into
lp:ubuntu-filemanager-app.
Commit message:
Removed unnecessary variable pathExists from DiskLocation::isThereDiskSpace()
Improved log for authenticateCallBacks.
Requested reviews:
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot):
continuous-integration
Ubuntu File Manager Developers (ubuntu-filemanager-dev)
For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09/+merge/276933
Removed unnecessary variable pathExists from DiskLocation::isThereDiskSpace()
Improved log for authenticateCallBacks.
--
Your team Ubuntu File Manager Developers is requested to review the proposed
merge of lp:~carlos-mazieri/ubuntu-filemanager-app/samba-improvements-09 into
lp:ubuntu-filemanager-app.
=== modified file 'src/plugin/folderlistmodel/disk/disklocation.cpp'
--- src/plugin/folderlistmodel/disk/disklocation.cpp 2015-11-02 15:58:50 +0000
+++ src/plugin/folderlistmodel/disk/disklocation.cpp 2015-11-08 12:33:22 +0000
@@ -216,12 +216,10 @@
{
bool ret = true;
#if defined(Q_OS_UNIX)
- QFileInfo info(pathname);
- bool pathExists = info.exists();
- while (!pathExists && info.absoluteFilePath() != QDir::rootPath())
+ QFileInfo info(pathname);
+ while (!info.exists() && info.absoluteFilePath() != QDir::rootPath())
{
- info.setFile(info.absolutePath());
- pathExists = info.exists();
+ info.setFile(info.absolutePath());
}
struct statvfs vfs;
if ( ::statvfs( QFile::encodeName(info.absoluteFilePath()).constData(), &vfs) == 0 )
=== modified file 'src/plugin/folderlistmodel/smb/smblocationauthentication.cpp'
--- src/plugin/folderlistmodel/smb/smblocationauthentication.cpp 2015-07-15 13:00:56 +0000
+++ src/plugin/folderlistmodel/smb/smblocationauthentication.cpp 2015-11-08 12:33:22 +0000
@@ -25,7 +25,7 @@
#define GOOD_INDEX() (m_infoIndex >= 0 && m_infoIndex < MAX_AUTH_INSTANCES)
#if defined(REGRESSION_TEST_FOLDERLISTMODEL) && defined(SIMPLE_UI)
-# define DEBUG_AUTHENTICATION() qDebug() << Q_FUNC_INFO << user << passwd
+# define DEBUG_AUTHENTICATION() qDebug() << Q_FUNC_INFO << "user:" << user << "passwd:" << passwd << "server:" << server << "share:" << share
#else
# define DEBUG_AUTHENTICATION() /**/
#endif
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
