[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=41335ae

The following commit has been merged in the master branch:
commit 41335ae32d7e81bf0f31c834185c04167299cbaf
Author: Leon Handreke <leonh at ndreke.de>
Date:   Sun Apr 13 22:29:02 2014 +0200

    Don't allow to open chat with self from group chat participant list
    
    REVIEW: 117553
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 lib/chat-widget.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index d130529..56d6c81 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -131,12 +131,13 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     d->ui.setupUi(this);
     if (d->isGroupChat) {
         d->contactsMenu = new QMenu(this);
-        d->contactsMenu->addAction(KIcon::fromTheme(QLatin1String("text-x-generic")),
+        QAction *action = d->contactsMenu->addAction(KIcon::fromTheme(QLatin1String("text-x-generic")),
                                    i18n("Open chat window"),
                                    this, SLOT(onOpenContactChatWindowClicked()));
-        QAction *action = d->contactsMenu->addAction(KIcon::fromTheme(QLatin1String("mail-attachment")),
-                                                     i18n("Send file"),
-                                                     this, SLOT(onSendFileClicked()));
+        action->setObjectName(QLatin1String("OpenChatWindowAction"));
+        action = d->contactsMenu->addAction(KIcon::fromTheme(QLatin1String("mail-attachment")),
+                                            i18n("Send file"),
+                                            this, SLOT(onSendFileClicked()));
         action->setObjectName(QLatin1String("SendFileAction"));
         d->contactsMenu->addSeparator();
         d->contactsMenu->addAction(i18n("Show info..."),
@@ -1085,6 +1086,10 @@ void ChatWidget::onContactsViewContextMenuRequested(const QPoint& point)
     }
 
     const KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast<Tp::Contact>(index.data(ChannelContactModel::ContactRole).value<Tp::ContactPtr>());
+
+    bool isSelfContact = ((Tp::ContactPtr) contact == textChannel()->groupSelfContact());
+    d->contactsMenu->findChild<QAction*>(QLatin1String("OpenChatWindowAction"))->setEnabled(!isSelfContact);
+
     d->contactsMenu->findChild<QAction*>(QLatin1String("SendFileAction"))->setEnabled(contact->fileTransferCapability());
 
     d->contactsMenu->setProperty("Contact", QVariant::fromValue(contact));

-- 
ktp-text-ui packaging