comparison libpurple/protocols/jabber/jutil.c @ 32819:2c6510167895 default tip

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents 3caef255ad47
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
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