Mercurial > pidgin
diff src/conversation.c @ 1442:2f4e6269b001
[gaim-migrate @ 1452]
option to bind ctl-enter to send
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 29 Jan 2001 01:57:37 +0000 |
| parents | 5c67b8794991 |
| children | ecf700f23852 |
line wrap: on
line diff
--- a/src/conversation.c Mon Jan 29 01:19:24 2001 +0000 +++ b/src/conversation.c Mon Jan 29 01:57:37 2001 +0000 @@ -471,10 +471,11 @@ close_callback(c->window, c); } } else if (event->keyval == GDK_Return) { - if (!(event->state & GDK_SHIFT_MASK) - && (general_options & OPT_GEN_ENTER_SENDS)) { + if ((event->state & GDK_CONTROL_MASK) && (general_options & OPT_GEN_CTL_ENTER)) { gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); - //to stop the putting in of the enter character + gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); + } else if (!(event->state & GDK_SHIFT_MASK) && (general_options & OPT_GEN_ENTER_SENDS)) { + gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); } else { gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");