[Gaim-commits] SF.net SVN: gaim: [17867] trunk/libgaim/protocols/jabber

[<the...@us...>]

Revision: 17867
          http://svn.sourceforge.net/gaim/?rev=17867&view=rev
Author:   thekingant
Date:     2006-12-01 01:47:20 -0800 (Fri, 01 Dec 2006)

Log Message:
-----------
Get rid of some silly casting

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c
    trunk/libgaim/protocols/jabber/buddy.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-12-01 08:07:17 UTC (rev 17866)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-12-01 09:47:20 UTC (rev 17867)
@@ -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

Modified: trunk/libgaim/protocols/jabber/buddy.c
===================================================================
--- trunk/libgaim/protocols/jabber/buddy.c	2006-12-01 08:07:17 UTC (rev 17866)
+++ trunk/libgaim/protocols/jabber/buddy.c	2006-12-01 09:47:20 UTC (rev 17867)
@@ -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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.