Mercurial > pidgin.yaz
changeset 363:1c4ce1da3946
[gaim-migrate @ 373]
whoops :) thanks GrsdLtning
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 08 Jun 2000 06:07:38 +0000 |
| parents | 596682d9a58e |
| children | 65a911f9df0d |
| files | src/buddy_chat.c src/conversation.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy_chat.c Thu Jun 08 02:05:42 2000 +0000 +++ b/src/buddy_chat.c Thu Jun 08 06:07:38 2000 +0000 @@ -351,7 +351,8 @@ { int pos; if (event->keyval == GDK_Return) { - if (!(event->state & GDK_SHIFT_MASK)) { + 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 {
--- a/src/conversation.c Thu Jun 08 02:05:42 2000 +0000 +++ b/src/conversation.c Thu Jun 08 06:07:38 2000 +0000 @@ -398,7 +398,8 @@ { int pos; if(event->keyval==GDK_Return) { - if(!(event->state & GDK_SHIFT_MASK)){ + if(!(event->state & GDK_SHIFT_MASK) + && (general_options & OPT_GEN_ENTER_SENDS)) { 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");