Mercurial > pidgin.yaz
changeset 10864:55e29b8e9689
[gaim-migrate @ 12548]
sf patch 1189105, from Will Thompson
"Completes the previously commented-out block in
gtkconv.c dealing with Alt-#. Checks that the tab
exists before switching to it."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 24 Apr 2005 21:26:33 +0000 |
| parents | f289e9f76053 |
| children | c28766b87f64 |
| files | COPYRIGHT src/gtkconv.c |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Apr 24 20:49:55 2005 +0000 +++ b/COPYRIGHT Sun Apr 24 21:26:33 2005 +0000 @@ -189,6 +189,7 @@ Philip Tellis Arun A. Tharuvai Cestonaro Thilo +Will Thompson Douglas Thrift (douglaswth) Stu Tomlinson Bill Tompkins
--- a/src/gtkconv.c Sun Apr 24 20:49:55 2005 +0000 +++ b/src/gtkconv.c Sun Apr 24 21:26:33 2005 +0000 @@ -1733,20 +1733,18 @@ } /* End of switch */ } -#if 0 /* If ALT (or whatever) was held down... */ else if (event->state & GDK_MOD1_MASK) { - /* XXX - Make sure the conv exists before switching to it */ - if (event->keyval > '0' && event->keyval <= '9') { + if (event->keyval > '0' && event->keyval <= '9') + { int switchto = event->keyval - '1'; - if (switchto < numconvs) - gaim_conv_window_switch_conversation(win, switchto); + if (switchto < gaim_conv_window_get_conversation_count(win)) + gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkwin->notebook), switchto); return TRUE; } } -#endif /* If neither CTRL nor ALT were held down... */ else