Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 29140:531f8367025e
jabber: Clean up this code a little.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 05 Dec 2009 22:48:34 +0000 |
| parents | d558d141aaae |
| children | 0f7025534fc5 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Dec 04 06:29:30 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Dec 05 22:48:34 2009 +0000 @@ -1742,13 +1742,15 @@ JabberIq *iq; xmlnode *block, *item; - js = gc->proto_data; + g_return_if_fail(who != NULL && *who != '\0'); + + js = purple_connection_get_protocol_data(gc); if (js == NULL) return; if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { - jabber_google_roster_add_deny(gc, who); + jabber_google_roster_add_deny(js, who); return; } @@ -1776,13 +1778,15 @@ JabberIq *iq; xmlnode *unblock, *item; - js = gc->proto_data; + g_return_if_fail(who != NULL && *who != '\0'); + + js = purple_connection_get_protocol_data(gc); if (js == NULL) return; if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { - jabber_google_roster_rem_deny(gc, who); + jabber_google_roster_rem_deny(js, who); return; }