changeset 10441:e0a4b8586cbe

[gaim-migrate @ 11701] compile warning fixes, and make an error message a little more clear as to the cause if someone wants to word it better, go right ahead committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/auth.c	Tue Dec 28 07:23:32 2004 +0000
+++ b/src/protocols/jabber/auth.c	Tue Dec 28 07:33:51 2004 +0000
@@ -48,7 +48,11 @@
 					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 			return TRUE;
 		} else if(xmlnode_get_child(starttls, "required")) {
-			gaim_connection_error(js->gc, _("Server requires SSL for login"));
+			if(gaim_ssl_is_supported()) {
+				gaim_connection_error(js->gc, _("Server requires TLS/SSL for login.  Select \"Enable TLS if available\" in account properties"));
+			} else {
+				gaim_connection_error(js->gc, _("Server requires TLS/SSL for login.  No TLS/SSL support found."));
+			}
 			return TRUE;
 		}
 	}
@@ -61,7 +65,7 @@
 	if(js->auth_type == JABBER_AUTH_PLAIN) {
 		xmlnode *auth;
 		GString *response;
-		char *enc_out;
+		unsigned char *enc_out;
 
 		auth = xmlnode_new("auth");
 		xmlnode_set_attrib(auth, "xmlns", "urn:ietf:params:xml:ns:xmpp-sasl");
@@ -300,7 +304,7 @@
 	md5_byte_t result[16];
 	size_t a1len;
 
-	char *x, *a1, *ha1, *ha2, *kd, *z, *convnode, *convpasswd;
+	unsigned char *x, *a1, *ha1, *ha2, *kd, *z, *convnode, *convpasswd;
 
 	if((convnode = g_convert(jid->node, strlen(jid->node), "iso-8859-1", "utf-8",
 					NULL, NULL, NULL)) == NULL) {

--- a/src/protocols/jabber/buddy.c	Tue Dec 28 07:23:32 2004 +0000
+++ b/src/protocols/jabber/buddy.c	Tue Dec 28 07:33:51 2004 +0000
@@ -381,12 +381,12 @@
 		if (vc_node->name &&
 				!g_ascii_strncasecmp(vc_node->name, "vCard", 5)) {
 			GError *error = NULL;
-			char *avatar_data;
+			unsigned char *avatar_data;
 			gsize avatar_len;
 
 			if(avatar_file && g_file_get_contents(avatar_file, &avatar_data, &avatar_len, &error)) {
 				xmlnode *photo;
-				char *enc;
+				unsigned char *enc;
 				int i;
 				unsigned char hashval[20];
 				char *p, hash[41];