# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1073342227 0
# Node ID 7bae464195c43dd2906bdf181a02b1440998d57c
# Parent  5f86d21b623268879ced87f19eed0b6ee6c54378
[gaim-migrate @ 8696]
fix jabber registrations for XMPP servers

committer: Tailor Script <tailor@pidgin.im>

diff -r 5f86d21b6232 -r 7bae464195c4 src/protocols/jabber/auth.c
--- a/src/protocols/jabber/auth.c	Mon Jan 05 22:09:29 2004 +0000
+++ b/src/protocols/jabber/auth.c	Mon Jan 05 22:37:07 2004 +0000
@@ -54,6 +54,11 @@
 		}
 	}
 
+	if(js->registration) {
+		jabber_register_start(js);
+		return;
+	}
+
 	mechs = xmlnode_get_child(packet, "mechanisms");
 
 	if(!mechs) {
diff -r 5f86d21b6232 -r 7bae464195c4 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Mon Jan 05 22:09:29 2004 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Jan 05 22:37:07 2004 +0000
@@ -688,7 +688,7 @@
 	}
 }
 
-static void jabber_register_start(JabberStream *js)
+void jabber_register_start(JabberStream *js)
 {
 	JabberIq *iq;
 
@@ -812,10 +812,12 @@
 		case JABBER_STREAM_AUTHENTICATING:
 			gaim_connection_update_progress(js->gc, _("Authenticating"),
 					js->gsc ? 6 : 3, JABBER_CONNECT_STEPS);
-			if(js->registration)
-				jabber_register_start(js);
-			else if(js->protocol_version == JABBER_PROTO_0_9)
-				jabber_auth_start_old(js);
+			if(js->protocol_version == JABBER_PROTO_0_9)  {
+				if(js->registration)
+					jabber_register_start(js);
+				else
+					jabber_auth_start_old(js);
+			}
 			break;
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
diff -r 5f86d21b6232 -r 7bae464195c4 src/protocols/jabber/jabber.h
--- a/src/protocols/jabber/jabber.h	Mon Jan 05 22:09:29 2004 +0000
+++ b/src/protocols/jabber/jabber.h	Mon Jan 05 22:37:07 2004 +0000
@@ -87,6 +87,7 @@
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state);
 
 void jabber_register_parse(JabberStream *js, xmlnode *packet);
+void jabber_register_start(JabberStream *js);
 
 char *jabber_get_next_id(JabberStream *js);
 
diff -r 5f86d21b6232 -r 7bae464195c4 src/protocols/jabber/message.c
--- a/src/protocols/jabber/message.c	Mon Jan 05 22:09:29 2004 +0000
+++ b/src/protocols/jabber/message.c	Mon Jan 05 22:37:07 2004 +0000
@@ -506,6 +506,8 @@
 	} else if(!strncmp(msg, "/part", 5)) {
 		jabber_chat_part(chat, strlen(msg) > 6 ? msg+6 : NULL);
 		return 1;
+	} else if(!strncmp(msg, "/ban", 4)) {
+	} else if(!strncmp(msg, "/kick", 5)) {
 	}
 
 	jm = g_new0(JabberMessage, 1);