Mercurial > pidgin.yaz
changeset 15082:bc440018e208
[gaim-migrate @ 17867]
Get rid of some silly casting
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 01 Dec 2006 09:47:20 +0000 |
| parents | d24de6319f87 |
| children | 133af8458cbd |
| files | libgaim/protocols/jabber/auth.c libgaim/protocols/jabber/buddy.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/jabber/auth.c Fri Dec 01 08:07:17 2006 +0000 +++ b/libgaim/protocols/jabber/auth.c Fri Dec 01 09:47:20 2006 +0000 @@ -740,7 +740,7 @@ { const char *ns = xmlnode_get_namespace(packet); #ifdef HAVE_CYRUS_SASL - int *x; + const int *x; #endif if(!ns || strcmp(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) { @@ -762,9 +762,9 @@ } } /* If we've negotiated a security layer, we need to enable it */ - sasl_getprop(js->sasl, SASL_SSF, (const void **)&x); - if (*x>0) { - sasl_getprop(js->sasl, SASL_MAXOUTBUF, (const void **)&x); + sasl_getprop(js->sasl, SASL_SSF, &x); + if (*x > 0) { + sasl_getprop(js->sasl, SASL_MAXOUTBUF, &x); js->sasl_maxbuf = *x; } #endif
--- a/libgaim/protocols/jabber/buddy.c Fri Dec 01 08:07:17 2006 +0000 +++ b/libgaim/protocols/jabber/buddy.c Fri Dec 01 09:47:20 2006 +0000 @@ -68,6 +68,9 @@ JabberBuddy *jb; const char *realname; + if (js->buddies == NULL) + return NULL; + if(!(realname = jabber_normalize(js->gc->account, name))) return NULL;