Tray tooltip: Use aliasGui #4096

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 8a67b4b56df14b0fdbde288d561e2e8ad8ab2530..c81dc43214bf9d01160f46162f65e2ee126cdfa9 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -286,7 +286,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()
             foreach(Folder* folder, map.values()) {
                 qDebug() << "Folder in overallStatus Message: " << folder << " with name " << folder->alias();
                 QString folderMessage = folderMan->statusToString(folder->syncResult().status(), folder->syncPaused());
-                allStatusStrings += tr("Folder %1: %2").arg(folder->alias(), folderMessage);
+                allStatusStrings += tr("Folder %1: %2").arg(folder->aliasGui(), folderMessage);
             }
             trayMessage = allStatusStrings.join(QLatin1String("\n"));
 #endif
@@ -331,13 +331,6 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
             menu->addAction(tr("Managed Folders:"))->setDisabled(true);
         }
 
-        // If there can only be a single sync folder, showing the alias is
-        // unnecessary.
-        QString folderName = folder->alias();
-        if (singleSyncFolder) {
-            folderName = Theme::instance()->appNameGUI();
-        }
-
         QAction *action = new QAction( tr("Open folder '%1'").arg(folder->path()), this );
         connect(action, SIGNAL(triggered()),_folderOpenActionMapper, SLOT(map()));
         _folderOpenActionMapper->setMapping( action, folder->alias() );