Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 25506:fb0b82b40f98
propagate from branch 'im.pidgin.pidgin' (head f68bc95ec93e616afdf0527fc982ff5f226f5463)
to branch 'im.pidgin.pidgin.yaz' (head 3fceb38f40e52c22e3be0bb7598c427acadd3454)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Mon, 11 Jun 2007 05:49:32 +0000 |
| parents | e556eb2f38d2 192a86dfade8 |
| children | cf708cbcbc04 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sun Jun 10 18:41:41 2007 +0000 +++ b/pidgin/gtkconv.c Mon Jun 11 05:49:32 2007 +0000 @@ -1860,6 +1860,9 @@ if (!gtkconv->send_history) break; + if (gtkconv->entry != entry) + break; + if (!gtkconv->send_history->prev) { GtkTextIter start, end; @@ -1908,6 +1911,9 @@ if (!gtkconv->send_history) break; + if (gtkconv->entry != entry) + break; + if (gtkconv->send_history->prev && gtkconv->send_history->prev->data) { GObject *object; GtkTextIter iter; @@ -2011,6 +2017,8 @@ switch (event->keyval) { case GDK_Tab: + if (gtkconv->entry != entry) + break; return tab_complete(conv); break; @@ -4283,6 +4291,8 @@ gtk_box_pack_start(GTK_BOX(hbox), gtkchat->topic_text, TRUE, TRUE, 0); gtk_widget_show(gtkchat->topic_text); + g_signal_connect(G_OBJECT(gtkchat->topic_text), "key_press_event", + G_CALLBACK(entry_key_press_cb), gtkconv); } /* Setup the horizontal pane. */