# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1177870927 0
# Node ID ce124db89c493dd8bd07823d5dca69634616f3d1
# Parent  219c267639f49ba9000b94b48c9a002e2ee4281e# Parent  9b41a619d2f78c148c75cedcd3e0650e319b2dc8
merge of '1c3349794aa946963ac9bcf471c009cbe121e986'
     and 'f279b82f5eab776e9265471cf85d6014342d969f'

diff -r 219c267639f4 -r ce124db89c49 finch/gntblist.c
--- a/finch/gntblist.c	Sun Apr 29 18:21:20 2007 +0000
+++ b/finch/gntblist.c	Sun Apr 29 18:22:07 2007 +0000
@@ -1699,8 +1699,17 @@
 
 	newmessage = gnt_entry_get_text(GNT_ENTRY(ggblist->statustext));
 	item = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(ggblist->status));
-	g_return_val_if_fail(item->type == STATUS_PRIMITIVE, FALSE);
-	newprim = item->u.prim;
+
+	switch (item->type) {
+		case STATUS_PRIMITIVE:
+			newprim = item->u.prim;
+			break;
+		case STATUS_SAVED_POPULAR:
+			newprim = purple_savedstatus_get_type(item->u.saved);
+			break;
+		default:
+			goto end;  /* 'New' or 'Saved' is selected, but this should never happen. */
+	}
 
 	if (newprim != prim || ((message && !newmessage) ||
 				(!message && newmessage) ||
@@ -1718,6 +1727,7 @@
 	}
 
 	gnt_box_give_focus_to_child(GNT_BOX(ggblist->window), ggblist->tree);
+end:
 	if (ggblist->typing)
 		g_source_remove(ggblist->typing);
 	ggblist->typing = 0;
diff -r 219c267639f4 -r ce124db89c49 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Sun Apr 29 18:21:20 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sun Apr 29 18:22:07 2007 +0000
@@ -819,7 +819,7 @@
 		} else {
 			response = xmlnode_new("response");
 			xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl");
-			if (c_out) {
+			if (clen > 0) {
 				enc_out = purple_base64_encode((unsigned char*)c_out, clen);
 				xmlnode_insert_data(response, enc_out, -1);
 				g_free(enc_out);
diff -r 219c267639f4 -r ce124db89c49 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Sun Apr 29 18:21:20 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Apr 29 18:22:07 2007 +0000
@@ -1447,10 +1447,10 @@
 					size_t len = 0;
 					if (filename)
 						data = pidgin_convert_buddy_icon(plug, filename, &len);
-					img = purple_buddy_icons_set_account_icon(box->account, data, len);
-					purple_account_set_buddy_icon_path(box->account, filename);
+					img = purple_buddy_icons_set_account_icon(account, data, len);
+					purple_account_set_buddy_icon_path(account, filename);
 
-					purple_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL));
+					purple_account_set_bool(account, "use-global-buddyicon", (filename != NULL));
 				}
 			}
 		}