comparison: src/conversation.c
src/conversation.c
- changeset 2748
- 5ba62cb0a6be
- parent 2745
- f3126ba5e307
- child 2749
- ee6f9af8a5b0
equal
deleted
inserted
replaced
| 2747:f302b025d810 | 2748:5ba62cb0a6be |
|---|---|
| 597 gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments); | 597 gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments); |
| 598 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) { | 598 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) { |
| 599 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) { | 599 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) { |
| 600 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); | 600 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); |
| 601 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); | 601 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); |
| 602 return TRUE; | |
| 602 } else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) { | 603 } else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) { |
| 603 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); | 604 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); |
| 604 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; | |
| 605 } else { | 607 } else { |
| 606 int oldpos; | 608 int oldpos; |
| 607 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"); |
| 608 oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry)); | 610 oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry)); |
| 609 gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos); | 611 gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos); |
| 610 if (oldpos == pos) | 612 if (oldpos == pos) |
| 611 gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1); | 613 gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1); |
| 614 return TRUE; | |
| 612 } | 615 } |
| 613 } else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) { | 616 } else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) { |
| 614 int oldpos; | 617 int oldpos; |
| 615 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); | 618 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); |
| 616 oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry)); | 619 oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry)); |
