Mercurial > pidgin.yaz
changeset 1594:ac8eddd16e89
[gaim-migrate @ 1604]
fixes for my stupidity
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 16 Mar 2001 20:33:28 +0000 |
| parents | ec31e23aadc7 |
| children | f281f4d94973 |
| files | src/buddy.c src/conversation.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Fri Mar 16 14:29:54 2001 +0000 +++ b/src/buddy.c Fri Mar 16 20:33:28 2001 +0000 @@ -420,7 +420,8 @@ update_buttons_by_protocol(c); } - raise_convo_tab(c); + if (display_options & OPT_DISP_ONE_WINDOW) + raise_convo_tab(c); } else if (event->type == GDK_BUTTON_PRESS && event->button == 3) { GtkWidget *menu; GtkWidget *button;
--- a/src/conversation.c Fri Mar 16 14:29:54 2001 +0000 +++ b/src/conversation.c Fri Mar 16 20:33:28 2001 +0000 @@ -1976,6 +1976,8 @@ entry = gtk_text_new(NULL, NULL); c->entry = entry; + if (!(display_options & OPT_DISP_ONE_WINDOW)) + gtk_window_set_focus(GTK_WINDOW(c->window), c->entry); toolbar = build_conv_toolbar(c); gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0);