Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/chat.c @ 23449:c45d05bd58ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 7be65dacd56b6536cf745747e39a29f4f7f2644b) to branch 'im.pidgin.xmpp.custom_smiley' (head a21aa16c365d48c3255358530932190b7263cc9d)
author Richard Laager <rlaager@wiktel.com>
date Wed, 11 Jun 2008 15:20:16 +0000
parents 4ac5db6e39f3
children 1de1494a13e5
comparison
equal deleted inserted replaced
23351:9cb1e75854f1 23449:c45d05bd58ed
29 #include "chat.h" 29 #include "chat.h"
30 #include "iq.h" 30 #include "iq.h"
31 #include "message.h" 31 #include "message.h"
32 #include "presence.h" 32 #include "presence.h"
33 #include "xdata.h" 33 #include "xdata.h"
34 #include "data.h"
34 35
35 GList *jabber_chat_info(PurpleConnection *gc) 36 GList *jabber_chat_info(PurpleConnection *gc)
36 { 37 {
37 GList *m = NULL; 38 GList *m = NULL;
38 struct proto_chat_entry *pce; 39 struct proto_chat_entry *pce;
676 if(msg) { 677 if(msg) {
677 xmlnode *status = xmlnode_new_child(presence, "status"); 678 xmlnode *status = xmlnode_new_child(presence, "status");
678 xmlnode_insert_data(status, msg, -1); 679 xmlnode_insert_data(status, msg, -1);
679 } 680 }
680 jabber_send(chat->js, presence); 681 jabber_send(chat->js, presence);
682
683 jabber_data_delete_associated_with_conv(chat->conv);
684
681 xmlnode_free(presence); 685 xmlnode_free(presence);
682 g_free(room_jid); 686 g_free(room_jid);
683 } 687 }
684 688
685 static void roomlist_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer data) 689 static void roomlist_disco_result_cb(JabberStream *js, xmlnode *packet, gpointer data)