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 20d15b9f42e1898f765efdb26025d3388ff2a026..45215d53ee333fae7eba6adf15b5472203265825 100644 (file)
--- 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 8fa91b454323f4105afdd53b385e2e77814bac2d..b973361c909d1f61400b584f3771833b4b34fa87 100644 (file)
--- 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 c4e8947240a706e7bde5c3fcea06a8da3ab3c288..36671e4739679f62b4ec3cd440722cb824e16faa 100644 (file)
--- 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)