Mercurial > pidgin
changeset 18330:a6fa0249d7f7
merge of '27846e24a6f7b260a1e3c53e16e35180aa5a240c'
and '64f522ee98f90529cdffd4be7cc7db4bc8930102'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 27 Jun 2007 22:20:28 +0000 |
| parents | 477dd067bdc1 (current diff) 075fa1c68bce (diff) |
| children | d19a86daa7f8 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);