# HG changeset patch # User Richard Laager # Date 1149409191 0 # Node ID 25a09aff5ddecb8e3bdcc81b447cb754f413e1db # Parent a93eeef163a9f39c9202a1ea123420f78a82459a [gaim-migrate @ 16217] The last of SF Patch #1500267 from Sadrul "if you press Escape when changing the status, it discards the changes and restores the statusbox to reflect current status." committer: Tailor Script diff -r a93eeef163a9 -r 25a09aff5dde src/gtkstatusbox.c --- a/src/gtkstatusbox.c Sun Jun 04 08:14:25 2006 +0000 +++ b/src/gtkstatusbox.c Sun Jun 04 08:19:51 2006 +0000 @@ -738,6 +738,16 @@ } if (!status_box->typing != 0) return FALSE; + + /* Reset the status if Escape was pressed */ + if (event->keyval == GDK_Escape) + { + g_source_remove(status_box->typing); + status_box->typing = 0; + status_menu_refresh_iter(status_box); + return TRUE; + } + gtk_gaim_status_box_pulse_typing(status_box); g_source_remove(status_box->typing); status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);