← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kopete/saucy-proposed

« back to all changes in this revision

Viewing changes to protocols/jabber/libiris/patches/05_xep_0184_id_attribute.patch

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-06-21 02:22:39 UTC
  • Revision ID: package-import@ubuntu.com-20130621022239-63l3zc8p0nf26pt6
Tags: upstream-4.10.80
Import upstream version 4.10.80

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/jabber/libiris/patches/05_xep_0184_id_attribute.patch
 
1
Index: src/xmpp/xmpp-im/xmpp_message.h
 
2
===================================================================
 
3
--- src/xmpp/xmpp-im/xmpp_message.h     (revision 1355873)
 
4
+++ src/xmpp/xmpp-im/xmpp_message.h     (working copy)
 
5
@@ -106,6 +106,8 @@
 
6
                // XEP-0184
 
7
                MessageReceipt messageReceipt() const;
 
8
                void setMessageReceipt(MessageReceipt);
 
9
+               QString messageReceiptId() const;
 
10
+               void setMessageReceiptId(const QString &s);
 
11
 
 
12
                // JEP-0027
 
13
                QString xencrypted() const;
 
14
Index: src/xmpp/xmpp-im/types.cpp
 
15
===================================================================
 
16
--- src/xmpp/xmpp-im/types.cpp  (revision 1355873)
 
17
+++ src/xmpp/xmpp-im/types.cpp  (working copy)
 
18
@@ -947,6 +947,7 @@
 
19
        QString xencrypted, invite;
 
20
        ChatState chatState;
 
21
        MessageReceipt messageReceipt;
 
22
+       QString messageReceiptId;
 
23
        QString nick;
 
24
        HttpAuthRequest httpAuthRequest;
 
25
        XData xdata;
 
26
@@ -1320,6 +1321,16 @@
 
27
        d->messageReceipt = messageReceipt;
 
28
 }
 
29
 
 
30
+QString Message::messageReceiptId() const
 
31
+{
 
32
+       return d->messageReceiptId;
 
33
+}
 
34
+
 
35
+void Message::setMessageReceiptId(const QString &s)
 
36
+{
 
37
+       d->messageReceiptId = s;
 
38
+}
 
39
+
 
40
 QString Message::xencrypted() const
 
41
 {
 
42
        return d->xencrypted;
 
43
@@ -1587,7 +1598,12 @@
 
44
                                s.appendChild(s.createElement(messageReceiptNS, "request"));
 
45
                                break;
 
46
                        case ReceiptReceived:
 
47
-                               s.appendChild(s.createElement(messageReceiptNS, "received"));
 
48
+                               {
 
49
+                               QDomElement elem = s.createElement(messageReceiptNS, "received");
 
50
+                               if (!d->messageReceiptId.isEmpty())
 
51
+                                       elem.setAttribute("id", d->messageReceiptId);
 
52
+                               s.appendChild(elem);
 
53
+                               }
 
54
                                break;
 
55
                        default: 
 
56
                                break;
 
57
@@ -1858,11 +1874,15 @@
 
58
        // message receipts
 
59
        QString messageReceiptNS = "urn:xmpp:receipts";
 
60
        t = childElementsByTagNameNS(root, messageReceiptNS, "request").item(0).toElement();
 
61
-       if(!t.isNull())
 
62
+       if(!t.isNull()) {
 
63
                d->messageReceipt = ReceiptRequest;
 
64
+               d->messageReceiptId.clear();
 
65
+       }
 
66
        t = childElementsByTagNameNS(root, messageReceiptNS, "received").item(0).toElement();
 
67
-       if(!t.isNull())
 
68
+       if(!t.isNull()) {
 
69
                d->messageReceipt = ReceiptReceived;
 
70
+               d->messageReceiptId = t.attribute("id");
 
71
+       }
 
72
 
 
73
        // xencrypted
 
74
        t = childElementsByTagNameNS(root, "jabber:x:encrypted", "x").item(0).toElement();