projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21c5dec
)
Bugfix. Conflict resolution button not clickable.
author
alex-z
<blackslayer4@gmail.com>
Mon, 5 Jun 2023 17:55:57 +0000
(19:55 +0200)
committer
Camila
<hello@camila.codes>
Wed, 7 Jun 2023 10:02:25 +0000
(07:02 -0300)
Signed-off-by: alex-z <blackslayer4@gmail.com>
src/gui/tray/ActivityItemContent.qml
patch
|
blob
|
history
diff --git
a/src/gui/tray/ActivityItemContent.qml
b/src/gui/tray/ActivityItemContent.qml
index a969eb395d108aaa012d9dfd926acb5febff4b60..81823e23e9187e95dffa7b995f7c81e6c8a8f48e 100644
(file)
--- a/
src/gui/tray/ActivityItemContent.qml
+++ b/
src/gui/tray/ActivityItemContent.qml
@@
-270,7
+270,7
@@
RowLayout {
maxActionButtons: activityModel.maxActionButtons
- onTriggerAction: activityModel.slotTriggerAction(
model
.activityIndex, actionIndex)
+ onTriggerAction: activityModel.slotTriggerAction(
activityData
.activityIndex, actionIndex)
onShowReplyField: isTalkReplyOptionVisible = true
}