# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1164966440 0
# Node ID bc440018e208b3f5a2861a5df3d871818cc56c73
# Parent  d24de6319f8785ba0ff1d5cb12ce4d9a8e863145
[gaim-migrate @ 17867]
Get rid of some silly casting

committer: Tailor Script <tailor@pidgin.im>

diff -r d24de6319f87 -r bc440018e208 libgaim/protocols/jabber/auth.c
--- 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
diff -r d24de6319f87 -r bc440018e208 libgaim/protocols/jabber/buddy.c
--- 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;