Mercurial > pidgin.yaz
changeset 1625:8c92ea5d854f
[gaim-migrate @ 1635]
good stuff
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Wed, 21 Mar 2001 07:25:43 +0000 |
| parents | 12bd198b6721 |
| children | 59c7e7831ccd |
| files | src/buddy.c src/conversation.c |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Wed Mar 21 03:25:57 2001 +0000 +++ b/src/buddy.c Wed Mar 21 07:25:43 2001 +0000 @@ -2366,7 +2366,7 @@ gtk_widget_show(menubar); - vbox = gtk_vbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 0); notebook = gtk_notebook_new();
--- a/src/conversation.c Wed Mar 21 03:25:57 2001 +0000 +++ b/src/conversation.c Wed Mar 21 07:25:43 2001 +0000 @@ -648,7 +648,7 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); } } - if (display_options & OPT_DISP_ONE_WINDOW) { + if (!c->is_chat && (display_options & OPT_DISP_ONE_WINDOW)) { if (event->keyval == '[') { gtk_notebook_prev_page(GTK_NOTEBOOK(convo_notebook)); gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); @@ -696,8 +696,9 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); } } - } else if ((display_options & OPT_DISP_ONE_WINDOW) && (event->state & GDK_MOD1_MASK) && - isdigit(event->keyval) && (event->keyval > '0')) { + } else if (!c->is_chat && (display_options & OPT_DISP_ONE_WINDOW) && + (event->state & GDK_MOD1_MASK) && isdigit(event->keyval) && + (event->keyval > '0')) { gtk_notebook_set_page(GTK_NOTEBOOK(convo_notebook), event->keyval - '1'); gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); }