Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/jabber.c @ 25774:514051f3b6cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add option for forcing BOSH (useful for debugging)
author Paul Aurich <paul@darkrain42.org>
date Mon, 01 Dec 2008 04:00:41 +0000
parents c4eb9f10ecb5
children 1516525c86fa
comparison
equal deleted inserted replaced
25773:f47429b5ab52 25774:514051f3b6cf
723 PurpleConnection *gc = purple_account_get_connection(account); 723 PurpleConnection *gc = purple_account_get_connection(account);
724 const char *connect_server = purple_account_get_string(account, 724 const char *connect_server = purple_account_get_string(account,
725 "connect_server", ""); 725 "connect_server", "");
726 JabberStream *js; 726 JabberStream *js;
727 JabberBuddy *my_jb = NULL; 727 JabberBuddy *my_jb = NULL;
728 /* XXX FORCE_BOSH */
729 gboolean force_bosh = purple_account_get_bool(account, "force_bosh", FALSE);
728 730
729 gc->flags |= PURPLE_CONNECTION_HTML | 731 gc->flags |= PURPLE_CONNECTION_HTML |
730 PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY; 732 PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
731 js = gc->proto_data = g_new0(JabberStream, 1); 733 js = gc->proto_data = g_new0(JabberStream, 1);
732 js->gc = gc; 734 js->gc = gc;
762 764
763 if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE))) 765 if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE)))
764 my_jb->subscription |= JABBER_SUB_BOTH; 766 my_jb->subscription |= JABBER_SUB_BOTH;
765 767
766 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING); 768 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
769
770 /* XXX FORCE_BOSH: Remove this */
771 if (force_bosh) {
772 purple_txt_resolve("_xmppconnect", js->user->domain, txt_resolved_cb, gc);
773 return;
774 }
767 775
768 /* if they've got old-ssl mode going, we probably want to ignore SRV lookups */ 776 /* if they've got old-ssl mode going, we probably want to ignore SRV lookups */
769 if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) { 777 if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) {
770 if(purple_ssl_is_supported()) { 778 if(purple_ssl_is_supported()) {
771 js->gsc = purple_ssl_connect(js->gc->account, 779 js->gsc = purple_ssl_connect(js->gc->account,