From acb279305345cea9ecd38de908a6a1bb0294fe34 Mon Sep 17 00:00:00 2001
From: Dimitar Dobrev <dpldobrev@yahoo.com>
Date: Tue, 11 Mar 2014 02:05:17 +0200
Subject: [PATCH] Ensured messages are sent to the group chat rather than to
 individual users.

---
 interface/interface_en.ts       |  8 ++++----
 interface/src/ui/ChatWindow.cpp | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index e5461bc1c2..5aeb683c8c 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -45,7 +45,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="100"/>
+        <location filename="src/ui/ChatWindow.cpp" line="104"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="100"/>
+        <location filename="src/ui/ChatWindow.cpp" line="104"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="100"/>
+        <location filename="src/ui/ChatWindow.cpp" line="104"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="150"/>
+        <location filename="src/ui/ChatWindow.cpp" line="154"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 7bcec5a2a9..3d0c140b0d 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -78,10 +78,14 @@ bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
     QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
     if ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) &&
         (keyEvent->modifiers() & Qt::ShiftModifier) == 0) {
-        QString message = ui->messagePlainTextEdit->document()->toPlainText();
-        if (!message.trimmed().isEmpty()) {
+        QString messageText = ui->messagePlainTextEdit->document()->toPlainText().trimmed();
+        if (!messageText.isEmpty()) {
             const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();
-            XmppClient::getInstance().getXMPPClient().sendMessage(publicChatRoom->jid(), message);
+            QXmppMessage message;
+            message.setTo(publicChatRoom->jid());
+            message.setType(QXmppMessage::GroupChat);
+            message.setBody(messageText);
+            XmppClient::getInstance().getXMPPClient().sendPacket(message);
             ui->messagePlainTextEdit->document()->clear();
         }
         return true;