changeset
merge of '7a6e9626ea147b93063909c7db75eca35cb34173'
Wed, 27 Jun 2007 22:20:28 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Wed, 27 Jun 2007 22:20:28 +0000
- changeset 18383
- 0822d23218d2
- parent 18379
- 7a6e9626ea14 (current diff)
- parent 18382
- 9db70c2608a0 (diff)
- child 18388
- cd580725323a
merge of '7a6e9626ea147b93063909c7db75eca35cb34173'
and '9db70c2608a09b2a76a00703d8b57542db5e5d36'
--- 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"),
--- 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,
--- 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);
