Fixed duplicate jabber messages, bug #199434, reported by Sebastian Lechte <seb AT stian.lechte.net>. Some other upsteam fixes.

(Portage version: 2.1.3.19)

2 files changed, 30 insertions, 0 deletions

diff --git a/net-im/sim/files/digest-sim-0.9.4.3-r1 b/net-im/sim/files/digest-sim-0.9.4.3-r1
new file mode 100644
index 000000000000..2bb858af2716
--- /dev/null
+++ b/net-im/sim/files/digest-sim-0.9.4.3-r1
@@ -0,0 +1,6 @@
+MD5 f941238d01e81705dfc42c7f3a626479 sim-0.9.4.3-r1919_1924.patch.bz2 53044
+RMD160 9982bc984fb8befe0680cae7115fdad575936458 sim-0.9.4.3-r1919_1924.patch.bz2 53044
+SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f sim-0.9.4.3-r1919_1924.patch.bz2 53044
+MD5 4bc30577e619e05252d394d51dc20747 sim-0.9.4.3.tar.bz2 3251965
+RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c sim-0.9.4.3.tar.bz2 3251965
+SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9 sim-0.9.4.3.tar.bz2 3251965
diff --git a/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch b/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch
new file mode 100644
index 000000000000..1f0cb2bb1ff5
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.4.3-double-message-fix.patch
@@ -0,0 +1,24 @@
+Patch fixes the issue of double message text display when receiving Jabber
+messages from some clients like Pidgin.
+
+Issue was reported as BerliOS.de bug #9681 (http://tinyurl.com/3bnss4)
+
+Patch extracted from http://tinyurl.com/yob7wm
+
+Prepared by Kir Kolyshkin <kir@openvz.org>, thanks to shaplov@
+
+--- sim-0.9.4.3/plugins/jabber/jabber_rosters.cpp.double-msg	2007-01-19 20:00:41.000000000 +0300
++++ sim-0.9.4.3/plugins/jabber/jabber_rosters.cpp	2007-10-10 01:43:44.000000000 +0400
+@@ -1413,9 +1413,10 @@
+     }
+     if (m_bEvent){
+         // Parsing <x xmlns='jabber:x:event'> tag, which contains JEP-0022 event info
+-        if (!strcmp(el, "composing"))
++        if (!strcmp(el, "composing")){
+             m_bCompose = true;
+-        return;
++            return;
++        }
+     }
+     if (!strcmp(el, "url-data")){
+         m_target = JabberClient::get_attr("target", attr);