Mercurial > pidgin.yaz
changeset 29870:8cf8a75875c8
- fix text entry's height
- handle im commit event properly in quick find entry
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Mon, 22 Feb 2010 17:17:28 +0900 |
| parents | f44718de8b06 |
| children | 0fe3f0bc0695 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Feb 22 16:05:25 2010 +0900 +++ b/pidgin/gtkconv.c Mon Feb 22 17:17:28 2010 +0900 @@ -4960,6 +4960,10 @@ switch (event->keyval) { case GDK_Return: case GDK_KP_Enter: + if (gtk_im_context_filter_keypress (GTK_ENTRY(entry)->im_context, event)) { + GTK_ENTRY(entry)->need_im_reset = TRUE; + return TRUE; + } if (gtk_imhtml_search_find(GTK_IMHTML(gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(entry)))) { gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL); } else { @@ -5152,6 +5156,11 @@ g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event", G_CALLBACK(refocus_entry_cb), gtkconv); + /* Setup the bottom half of the conversation window */ + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + gtk_paned_pack2(GTK_PANED(paned), vbox, FALSE, TRUE); + gtk_widget_show(vbox); + pidgin_conv_setup_quickfind(gtkconv, vbox); gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);