# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1159378124 0
# Node ID 459dafda90af5c99824922e29abab37627102d12
# Parent  c811cfc944d174f8318ee8e6e55cb44e45d703fd
[gaim-migrate @ 17384]
GtkCellRendererExpander draws an expander in a renderer to avoid a large, needless margin.
The approach is a bit hacky, but it's a good job.

- RTL fix in GtkStatusBox
- Drag-and-drop image into the global buddy icon selector to set a buddy icon

committer: Tailor Script <tailor@pidgin.im>

diff -r c811cfc944d1 -r 459dafda90af libgaim/protocols/jabber/jabber.c
--- a/libgaim/protocols/jabber/jabber.c	Wed Sep 27 04:44:30 2006 +0000
+++ b/libgaim/protocols/jabber/jabber.c	Wed Sep 27 17:28:44 2006 +0000
@@ -407,6 +407,8 @@
 			if (olen>0) {
 				gaim_debug(GAIM_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out);
 				jabber_parser_process(js,out,olen);
+				if(js->reinit)
+					jabber_stream_init(js);
 			}
 			return;
 		}
@@ -414,6 +416,8 @@
 		buf[len] = '\0';
 		gaim_debug(GAIM_DEBUG_INFO, "jabber", "Recv (%d): %s\n", len, buf);
 		jabber_parser_process(js, buf, len);
+		if(js->reinit)
+			jabber_stream_init(js);
 	} else if(errno == EAGAIN) {
 		return;
 	} else {
@@ -1022,12 +1026,10 @@
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
 					(js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
-			if (js->gsc) {
-				/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
-				js->reinit = TRUE;
-			} else {
-				jabber_stream_init(js);
-			}
+			
+			/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
+			js->reinit = TRUE;
+			
 			break;
 		case JABBER_STREAM_CONNECTED:
 			jabber_roster_request(js);
diff -r c811cfc944d1 -r 459dafda90af libgaim/protocols/jabber/parser.c
--- a/libgaim/protocols/jabber/parser.c	Wed Sep 27 04:44:30 2006 +0000
+++ b/libgaim/protocols/jabber/parser.c	Wed Sep 27 17:28:44 2006 +0000
@@ -174,7 +174,7 @@
 		/* libxml inconsistently starts parsing on creating the
 		 * parser, so do a ParseChunk right afterwards to force it. */
 		js->context = xmlCreatePushParserCtxt(&jabber_parser_libxml, js, buf, len, NULL);
-		xmlParseChunk(js->context, NULL, 0, 0);
+		xmlParseChunk(js->context, "", 0, 0);
 	} else if (xmlParseChunk(js->context, buf, len, 0) < 0) {
 		gaim_connection_error(js->gc, _("XML Parse error"));
 	}