------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=121507
------- Additional Comments From ogoffart kde org 2006-04-04 10:28 -------
SVN commit 526247 by ogoffart:
JEP-0085 seems require the type of the chat to be set.
(tested with gajim)
CCBUG: 121507
M +13 -1 jabberchatsession.cpp
A libiris/008_chatstatesfix.patch
M +5 -5 libiris/iris/xmpp-im/types.cpp
--- branches/kopete/0.12/kopete/protocols/jabber/jabberchatsession.cpp
#526246:526247
@ -76,7 +76,9 @
JabberChatSession::~JabberChatSession( )
{
- sendNotification( XMPP::GoneEvent );
+ if ( account()->configGroup()->readBoolEntry ("SendEvents", true) &&
+ account()->configGroup()->readBoolEntry
("SendGoneEvent", true) )
+ sendNotification( XMPP::GoneEvent );
}
@ -182,6 +184,16 @
message.setEventId ( contact->lastReceivedMessageId ()
);
// store composing event depending on state
message.addEvent ( event );
+
+ if (view() && view()->plugin()->pluginId() ==
"kopete_emailwindow" )
+ {
+ message.setType ( "normal" );
+ }
+ else
+ {
+ message.setType ( "chat" );
+ }
+
// send message
account()->client()->sendMessage ( message );
--- branches/kopete/0.12/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
#526246:526247
@ -544,7 +544,7 @
else
x.appendChild(s.createTextElement("jabber:x:event","id",d->eventId));
}
- else
+ else if (d->type=="chat" || d->type=="groupchat")
s.appendChild( s.createElement(NS_CHATSTATES ,
"active" ) );
bool need_x_event=false;
@ -565,20 +565,20 @
case ComposingEvent:
x.appendChild(s.createElement("jabber:x:event", "composing"));
need_x_event=true;
- if (d->body.isEmpty())
+ if (d->body.isEmpty() &&
(d->type=="chat" || d->type=="groupchat") )
s.appendChild(
s.createElement(NS_CHATSTATES , "composing" ) );
break;
case CancelEvent:
need_x_event=true;
- if (d->body.isEmpty())
+ if (d->body.isEmpty() &&
(d->type=="chat" || d->type=="groupchat") )
s.appendChild(
s.createElement(NS_CHATSTATES , "paused" ) );
break;
case InactiveEvent:
- if (d->body.isEmpty())
+ if (d->body.isEmpty() &&
(d->type=="chat" || d->type=="groupchat") )
s.appendChild(
s.createElement(NS_CHATSTATES , "inactive" ) );
break;
case GoneEvent:
- if (d->body.isEmpty())
+ if (d->body.isEmpty() &&
(d->type=="chat" || d->type=="groupchat") )
s.appendChild(
s.createElement(NS_CHATSTATES , "gone" ) );
break;
}
_______________________________________________
kopete-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kopete-devel
