comparison libpurple/protocols/jabber/jutil.c @ 32672:3828a61c44da

A boring and large patch so I can merge heads.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:21:58 +0000
parents b44e3c2e83e1
children
comparison
equal deleted inserted replaced
32671:0e69949b3e61 32672:3828a61c44da
581 return jabber_id_new_internal(str, FALSE); 581 return jabber_id_new_internal(str, FALSE);
582 } 582 }
583 583
584 const char *jabber_normalize(const PurpleAccount *account, const char *in) 584 const char *jabber_normalize(const PurpleAccount *account, const char *in)
585 { 585 {
586 PurpleConnection *gc = account ? account->gc : NULL; 586 PurpleConnection *gc = NULL;
587 JabberStream *js = gc ? gc->proto_data : NULL; 587 JabberStream *js = NULL;
588 static char buf[3072]; /* maximum legal length of a jabber jid */ 588 static char buf[3072]; /* maximum legal length of a jabber jid */
589 JabberID *jid; 589 JabberID *jid;
590
591 if (account)
592 gc = purple_account_get_connection(account);
593 if (gc)
594 js = purple_connection_get_protocol_data(gc);
590 595
591 jid = jabber_id_new_internal(in, TRUE); 596 jid = jabber_id_new_internal(in, TRUE);
592 if(!jid) 597 if(!jid)
593 return NULL; 598 return NULL;
594 599