X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fchatitem.cpp;h=de96b2dfdb437dee697aa2d89d01a1438820bce1;hb=c6a9c963d53a171394b5c25d9925661e2788cec3;hp=9b7c220343905b31f3e1d45726a875cc45155416;hpb=e8e50ceb0f0df46a6f281f6d4fd587f00fe532d3;p=quassel.git

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 9b7c2203..de96b2df 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -32,6 +32,7 @@
 #include "bufferview.h"
 #include "chatitem.h"
 #include "chatlinemodel.h"
+#include "contextmenuactionprovider.h"
 #include "iconloader.h"
 #include "mainwin.h"
 #include "qtui.h"
@@ -286,9 +287,9 @@ void ChatItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
-  Q_UNUSED(menu);
   Q_UNUSED(pos);
 
+  GraphicalUi::contextMenuActionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>());
 }
 
 // ************************************************************
@@ -602,8 +603,6 @@ void ContentsChatItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
 }
 
 void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
-  Q_UNUSED(pos); // we assume that the current mouse cursor pos is the point of invocation
-
   if(privateData()->currentClickable.isValid()) {
     Clickable click = privateData()->currentClickable;
     switch(click.type) {
@@ -617,16 +616,15 @@ void ContentsChatItem::addActionsToMenu(QMenu *menu, const QPointF &pos) {
         foreach(QAction *action, menu->actions())
           action->setVisible(false);
         QString name = data(ChatLineModel::DisplayRole).toString().mid(click.start, click.length);
-        Client::mainUi()->actionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>(), name);
+        GraphicalUi::contextMenuActionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>(), name);
         break;
       }
       default:
         break;
     }
   } else {
-
     // Buffer-specific actions
-    Client::mainUi()->actionProvider()->addActions(menu, chatScene()->filter(), data(MessageModel::BufferIdRole).value<BufferId>());
+    ChatItem::addActionsToMenu(menu, pos);
   }
 }