Mercurial > pidgin.yaz
changeset 8106:70816fbc2541
[gaim-migrate @ 8806]
I think I got ctrl+pgup and ctrl+pgdown backwards. Whoops :-)
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 15 Jan 2004 04:02:12 +0000 |
| parents | 42c7227d6e4d |
| children | c0ee65d9453c |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Thu Jan 15 03:43:32 2004 +0000 +++ b/src/gtkconv.c Thu Jan 15 04:02:12 2004 +0000 @@ -1323,15 +1323,15 @@ break; case GDK_Page_Up: - if (curconv + 1 < numconvs) - gaim_conv_window_switch_conversation(win, curconv + 1); + if (curconv > 0) + gaim_conv_window_switch_conversation(win, curconv - 1); return TRUE; break; case GDK_Page_Down: - if (curconv > 0) - gaim_conv_window_switch_conversation(win, curconv - 1); + if (curconv + 1 < numconvs) + gaim_conv_window_switch_conversation(win, curconv + 1); return TRUE; break; @@ -3736,8 +3736,7 @@ default_formatize(conv); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR); gtk_widget_set_size_request(gtkconv->entry, -1, - MAX(gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height"), - 25)); + gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height")); g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", @@ -3835,8 +3834,7 @@ default_formatize(conv); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR); gtk_widget_set_size_request(gtkconv->entry, -1, - MAX(gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"), - 25)); + gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height")); g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv); g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",