[Pkg-owncloud-commits] [owncloud-client] 117/470: Show full path in warning message boxes before folder removal

[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 b456ded5e775c23288e94ebd9cb83f29fe9d0b97
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Tue Mar 8 13:55:22 2016 +0100

    Show full path in warning message boxes before folder removal
    
    Fixes #4545
---
 src/gui/folder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index da6eedf..22a2448 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1186,7 +1186,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
            "the files were manually removed.\n"
            "Are you sure you want to perform this operation?");
     QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"),
-                       msg.arg(alias()));
+                       msg.arg(aliasGui()));
     msgBox.addButton(tr("Remove all files"), QMessageBox::DestructiveRole);
     QPushButton* keepBtn = msgBox.addButton(tr("Keep files"), QMessageBox::AcceptRole);
     if (msgBox.exec() == -1) {
@@ -1212,7 +1212,7 @@ void Folder::slotAboutToRestoreBackup(bool *restore)
            "file in an earlier state. "
            "Do you want to keep your local most recent files as conflict files?");
     QMessageBox msgBox(QMessageBox::Warning, tr("Backup detected"),
-                       msg.arg(alias()));
+                       msg.arg(aliasGui()));
     msgBox.addButton(tr("Normal Synchronisation"), QMessageBox::DestructiveRole);
     QPushButton* keepBtn = msgBox.addButton(tr("Keep Local Files as Conflict"), QMessageBox::AcceptRole);
 

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