comparison src/conversation.c @ 2773:a0fd8f91e294

[gaim-migrate @ 2786] SPAM!!! All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined. Or was that supposed to be the other way around. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Tue, 20 Nov 2001 01:01:22 +0000
parents e5e78d42e49e
children feea7103a235
comparison
equal deleted inserted replaced
2772:f9227268db25 2773:a0fd8f91e294
602 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) { 602 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) {
603 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) { 603 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) {
604 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); 604 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
605 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); 605 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
606 return TRUE; 606 return TRUE;
607 } else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) { 607 } else if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) && (convo_options & OPT_CONVO_ENTER_SENDS)) {
608 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); 608 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
609 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); 609 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
610 return TRUE; 610 return TRUE;
611 } else { 611 } else {
612 int oldpos; 612 int oldpos;