Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 23445:4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
committer: Sadrul Habib Chowdhury <imadil@gmail.com>
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 01 Jun 2008 20:55:54 +0000 |
| parents | e0bcb8cfda74 |
| children | c45d05bd58ed |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sun Jun 01 18:08:14 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Jun 01 20:55:54 2008 +0000 @@ -42,6 +42,7 @@ #include "auth.h" #include "buddy.h" #include "chat.h" +#include "data.h" #include "disco.h" #include "google.h" #include "iq.h" @@ -57,6 +58,7 @@ #include "pep.h" #include "adhoccommands.h" + #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5) static PurplePlugin *my_protocol = NULL; @@ -610,7 +612,8 @@ JabberStream *js; JabberBuddy *my_jb = NULL; - gc->flags |= PURPLE_CONNECTION_HTML; + gc->flags |= PURPLE_CONNECTION_HTML | + PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY; js = gc->proto_data = g_new0(JabberStream, 1); js->gc = gc; js->fd = -1; @@ -1862,6 +1865,10 @@ JabberID *jid; JabberBuddy *jb; JabberBuddyResource *jbr; + PurpleAccount *account = purple_connection_get_account(gc); + PurpleConversation *conv = + purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, + who, account); if(!(jid = jabber_id_new(who))) return; @@ -1876,6 +1883,8 @@ jabber_message_conv_closed(js, who); } + jabber_data_delete_associated_with_conv(conv); + jabber_id_free(jid); }