Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 26014:bd598b606ca4 | 26020:8bfa1f01f035 |
|---|---|
| 40 #include "xmlnode.h" | 40 #include "xmlnode.h" |
| 41 | 41 |
| 42 #include "auth.h" | 42 #include "auth.h" |
| 43 #include "buddy.h" | 43 #include "buddy.h" |
| 44 #include "chat.h" | 44 #include "chat.h" |
| 45 #include "data.h" | |
| 45 #include "disco.h" | 46 #include "disco.h" |
| 46 #include "google.h" | 47 #include "google.h" |
| 47 #include "iq.h" | 48 #include "iq.h" |
| 48 #include "jutil.h" | 49 #include "jutil.h" |
| 49 #include "message.h" | 50 #include "message.h" |
| 648 const char *connect_server = purple_account_get_string(account, | 649 const char *connect_server = purple_account_get_string(account, |
| 649 "connect_server", ""); | 650 "connect_server", ""); |
| 650 JabberStream *js; | 651 JabberStream *js; |
| 651 JabberBuddy *my_jb = NULL; | 652 JabberBuddy *my_jb = NULL; |
| 652 | 653 |
| 653 gc->flags |= PURPLE_CONNECTION_HTML; | 654 gc->flags |= PURPLE_CONNECTION_HTML | |
| 655 PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY; | |
| 654 js = gc->proto_data = g_new0(JabberStream, 1); | 656 js = gc->proto_data = g_new0(JabberStream, 1); |
| 655 js->gc = gc; | 657 js->gc = gc; |
| 656 js->fd = -1; | 658 js->fd = -1; |
| 657 js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, | 659 js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 658 g_free, g_free); | 660 g_free, g_free); |
| 666 js->next_id = g_random_int(); | 668 js->next_id = g_random_int(); |
| 667 js->write_buffer = purple_circ_buffer_new(512); | 669 js->write_buffer = purple_circ_buffer_new(512); |
| 668 js->old_length = 0; | 670 js->old_length = 0; |
| 669 js->keepalive_timeout = -1; | 671 js->keepalive_timeout = -1; |
| 670 js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL); | 672 js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL); |
| 671 | |
| 672 #ifdef USE_VV | 673 #ifdef USE_VV |
| 673 js->sessions = NULL; | 674 js->sessions = NULL; |
| 674 #endif | 675 #endif |
| 675 | 676 |
| 676 if(!js->user) { | 677 if(!js->user) { |
| 2399 | 2400 |
| 2400 gboolean jabber_offline_message(const PurpleBuddy *buddy) | 2401 gboolean jabber_offline_message(const PurpleBuddy *buddy) |
| 2401 { | 2402 { |
| 2402 return TRUE; | 2403 return TRUE; |
| 2403 } | 2404 } |
| 2404 | |
| 2405 #ifdef USE_VV | 2405 #ifdef USE_VV |
| 2406 | 2406 |
| 2407 PurpleMedia * | 2407 PurpleMedia * |
| 2408 jabber_initiate_media(PurpleConnection *gc, const char *who, | 2408 jabber_initiate_media(PurpleConnection *gc, const char *who, |
| 2409 PurpleMediaSessionType type) | 2409 PurpleMediaSessionType type) |