# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1182982828 0
# Node ID a6fa0249d7f7e74b4a58d922d9d6014e7748e829
# Parent  477dd067bdc1ffb7c4111b744e2fdf588e982fb0# Parent  075fa1c68bce749b1ce86db0b71d8d9b10c9fd06
merge of '27846e24a6f7b260a1e3c53e16e35180aa5a240c'
     and '64f522ee98f90529cdffd4be7cc7db4bc8930102'

diff -r 477dd067bdc1 -r a6fa0249d7f7 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Wed Jun 27 22:18:07 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Wed Jun 27 22:20:28 2007 +0000
@@ -1369,11 +1369,13 @@
 	field = purple_request_field_string_new("password1", _("Password"),
 			"", FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
+	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_string_new("password2", _("Password (again)"),
 			"", FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
+	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	purple_request_fields(js->gc, _("Change XMPP Password"),
diff -r 477dd067bdc1 -r a6fa0249d7f7 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Wed Jun 27 22:18:07 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Wed Jun 27 22:20:28 2007 +0000
@@ -558,7 +558,6 @@
 			jabber_buddy_remove_resource(jb, jid->resource);
 			if((conv = jabber_find_unnormalized_conv(from, js->gc->account)))
 				purple_conversation_set_name(conv, buddy_name);
-	printf("Removed resource\n");
 
 		} else {
 			jbr = jabber_buddy_track_resource(jb, jid->resource, priority,
diff -r 477dd067bdc1 -r a6fa0249d7f7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Jun 27 22:18:07 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Jun 27 22:20:28 2007 +0000
@@ -1749,6 +1749,9 @@
 
 	gtk_tree_selection_select_path(GTK_TREE_SELECTION(
 			gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkchat->list))), path);
+	gtk_tree_view_set_cursor(GTK_TREE_VIEW(gtkchat->list),
+							 path, NULL, FALSE); 
+	gtk_widget_grab_focus(GTK_WIDGET(gtkchat->list));
 
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
 	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);