From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 3 May 2023 16:33:19 +0000 (+0200)
Subject: tune the pipes to really get a dialog to show for many conflicts
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f799d8c697964023c3643ac95eb44ce595981ba6;p=nextcloud-desktop.git

tune the pipes to really get a dialog to show for many conflicts

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

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 20d15b9f4..45215d53e 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -140,6 +140,7 @@ ownCloudGui::ownCloudGui(Application *parent)
     qRegisterMetaType<SharePtr>("SharePtr");
     qRegisterMetaType<ShareePtr>("ShareePtr");
     qRegisterMetaType<Sharee>("Sharee");
+    qRegisterMetaType<OCC::ActivityList>("ActivityList");
 
     qmlRegisterSingletonInstance("com.nextcloud.desktopclient", 1, 0, "UserModel", UserModel::instance());
     qmlRegisterSingletonInstance("com.nextcloud.desktopclient", 1, 0, "UserAppsModel", UserAppsModel::instance());
diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
index 8fa91b454..b973361c9 100644
--- a/src/gui/tray/SyncStatus.qml
+++ b/src/gui/tray/SyncStatus.qml
@@ -152,7 +152,7 @@ RowLayout {
                  NC.UserModel.currentUser.isConnected
         enabled: visible
         onClicked: {
-            Systray.createResolveConflictsDialog();
+            NC.Systray.createResolveConflictsDialog();
         }
     }
 }
diff --git a/src/gui/tray/activitydata.h b/src/gui/tray/activitydata.h
index c4e894724..36671e473 100644
--- a/src/gui/tray/activitydata.h
+++ b/src/gui/tray/activitydata.h
@@ -178,6 +178,7 @@ using ActivityList = QList<Activity>;
 }
 
 Q_DECLARE_METATYPE(OCC::Activity)
+Q_DECLARE_METATYPE(OCC::ActivityList)
 Q_DECLARE_METATYPE(OCC::Activity::Type)
 Q_DECLARE_METATYPE(OCC::ActivityLink)
 Q_DECLARE_METATYPE(OCC::PreviewData)