Manually apply patch 004 (which does xhtml im) and
commitec75389c87146f196affdbd0172cc2a3bf0af738
authormattr <mattr@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Sat, 2 Feb 2008 04:08:44 +0000 (2 04:08 +0000)
committermattr <mattr@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Sat, 2 Feb 2008 04:08:44 +0000 (2 04:08 +0000)
treebb733a4f022e2d55be3b46173ee5fbc9ac4fff0b
parent823f697e03b74d8672cba42a54687a14252eb2e0
Manually apply patch 004 (which does xhtml im) and
generate a new patch. I didn't merge one section of the
previous patch, hence this new patch.

the svn log seems to indicate that this patch should be
obsolete, but it's needed for jabber to compile, so we get at
least part of it back.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@769818 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
12 files changed:
kopete/protocols/jabber/libiris/018_xhtml_im_compile.patch [new file with mode: 0644]
kopete/protocols/jabber/libiris/iris/include/xmpp_clientstream.h
kopete/protocols/jabber/libiris/iris/include/xmpp_features.h
kopete/protocols/jabber/libiris/iris/include/xmpp_message.h
kopete/protocols/jabber/libiris/iris/include/xmpp_stanza.h
kopete/protocols/jabber/libiris/iris/include/xmpp_stream.h
kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.h
kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
kopete/protocols/jabber/libiris/iris/xmpp-core/xmpp_stanza.cpp
kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_features.cpp
kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp