Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 26020:8bfa1f01f035
merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06'
and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:40:59 +0000 |
| parents | bd598b606ca4 4d752d07a126 |
| children | 46387cbfaf85 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 19 04:37:23 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Oct 19 04:40:59 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" @@ -650,7 +651,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; @@ -668,7 +670,6 @@ js->old_length = 0; js->keepalive_timeout = -1; js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL); - #ifdef USE_VV js->sessions = NULL; #endif @@ -2401,7 +2402,6 @@ { return TRUE; } - #ifdef USE_VV PurpleMedia *