soc.2009.transport: 1f3c62de: Test features for active PurpleConversat...

Wed Jul 1 09:30:50 EDT 2009

-----------------------------------------------------------------
Revision: 1f3c62deace0c61b3216a7e65180b01c7c607310
Ancestor: 7e80eca1f01c6ea39e8df620b4a2c9a6d8e91bb3
Author: hanzz at soc.pidgin.im
Date: 2009-07-01T13:22:23
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/1f3c62deace0c61b3216a7e65180b01c7c607310

Modified files:
        user.cpp

ChangeLog: 

Test features for active PurpleConversation resource

-------------- next part --------------
============================================================

--- user.cpp	a0fdf613b7246e97fdfe441aecc25a6fd42f7610
+++ user.cpp	9a29cdeb7f2c3a4adf360e09e8c944b81d17126c
@@ -584,7 +584,7 @@ void User::purpleConversationWriteIM(Pur
 
 	// chatstates
 	if (purple_value_get_boolean(getSetting("enable_chatstate"))) {
-		if (hasFeature(GLOOX_FEATURE_CHATSTATES)) {
+		if (hasFeature(GLOOX_FEATURE_CHATSTATES, m_conversations[name].resource)) {
 			ChatState *c = new ChatState(ChatStateActive);
 			s.addExtension(c);
 		}
@@ -607,7 +607,7 @@ void User::purpleConversationWriteIM(Pur
 		m.erase(m.length() - 7, 7);
 	}
 	Log().Get("TEST") << m << " " << message;
-	if (hasFeature(GLOOX_FEATURE_XHTML_IM) && m != message) {
+	if (hasFeature(GLOOX_FEATURE_XHTML_IM, m_conversations[name].resource)) && m != message) {
 		p->parser()->getTag("<body>" + m + "</body>", sendXhtmlTag, stanzaTag);
 		g_free(newline);
 		g_free(strip);
