Mercurial > pidgin

comparison src/protocols/jabber/jabber.c @ 5613:3d0a2b9f5a8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6019] ok, finally think i've got this right committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sat, 31 May 2003 17:12:14 +0000
parents 340cb17d3e37
children 0bdfa28c678e
comparison
equal deleted inserted replaced
5612:9cd94a5bec8e 5613:3d0a2b9f5a8e
808 808
809 static void gjab_start(gjconn gjc) 809 static void gjab_start(gjconn gjc)
810 { 810 {
811 GaimAccount *account; 811 GaimAccount *account;
812 int port, rc; 812 int port, rc;
813 const char *connect_server;
813 const char *server; 814 const char *server;
814 815
815 if (!gjc || gjc->state != JCONN_STATE_OFF) 816 if (!gjc || gjc->state != JCONN_STATE_OFF)
816 return; 817 return;
817 818
818 account = GJ_GC(gjc)->account; 819 account = GJ_GC(gjc)->account;
819 port = gaim_account_get_int(account, "port", DEFAULT_PORT); 820 port = gaim_account_get_int(account, "port", DEFAULT_PORT);
820 server = gaim_account_get_string(account, "connect_server", 821 connect_server = gaim_account_get_string(account, "connect_server", "");
821 gjc->user->server); 822 server = connect_server[0] ? connect_server : gjc->user->server;
823
822 824
823 gjc->parser = XML_ParserCreate(NULL); 825 gjc->parser = XML_ParserCreate(NULL);
824 XML_SetUserData(gjc->parser, (void *)gjc); 826 XML_SetUserData(gjc->parser, (void *)gjc);
825 XML_SetElementHandler(gjc->parser, startElement, endElement); 827 XML_SetElementHandler(gjc->parser, startElement, endElement);
826 XML_SetCharacterDataHandler(gjc->parser, charData); 828 XML_SetCharacterDataHandler(gjc->parser, charData);