ensure the URL to mimetype icons are correct

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index 6f8241c14cad89f015eed57e4fb78149a8e09adb..5e83d951a1fbccca159ae6353a055b747db17510 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -147,12 +147,12 @@ QtWindow.Window {
 
             onAccepted: function() {
                 console.log("Ok clicked")
-                Systray.destroyDialog(root)
+                Systray.destroyDialog(conflictsDialog)
             }
 
             onRejected: function() {
                 console.log("Cancel clicked")
-                Systray.destroyDialog(root)
+                Systray.destroyDialog(conflictsDialog)
             }
         }
     }

diff --git a/src/gui/syncconflictsmodel.cpp b/src/gui/syncconflictsmodel.cpp
index 613a0bbbc3ba21c9c9d22ec3966e52ac4be0a803..b03d35371970a2299cd50861e11cd3d43425f2c6 100644 (file)
--- a/src/gui/syncconflictsmodel.cpp
+++ b/src/gui/syncconflictsmodel.cpp
@@ -146,8 +146,6 @@ void SyncConflictsModel::updateConflictsData()
         const auto conflictedPath = dir.filePath(conflictedRelativePath);
         const auto basePath = dir.filePath(baseRelativePath);
 
-        qCInfo(lcSyncConflictsModel()) << "conflictedPath" << conflictedPath << "basePath" << basePath;
-
         const auto existingFileInfo = QFileInfo(basePath);
         const auto conflictFileInfo = QFileInfo(conflictedPath);
 
@@ -157,8 +155,8 @@ void SyncConflictsModel::updateConflictsData()
             mLocale.formattedDataSize(conflictFileInfo.size()),
             existingFileInfo.lastModified().toString(),
             conflictFileInfo.lastModified().toString(),
-            QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.fileName()},
-            QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.fileName()},
+            QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.filePath()},
+            QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.filePath()},
             false,
             false,
         };