comparison 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
comparison
equal deleted inserted replaced
1441:5c67b8794991 1442:2f4e6269b001
469 if (general_options & OPT_GEN_ESC_CAN_CLOSE) { 469 if (general_options & OPT_GEN_ESC_CAN_CLOSE) {
470 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); 470 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
471 close_callback(c->window, c); 471 close_callback(c->window, c);
472 } 472 }
473 } else if (event->keyval == GDK_Return) { 473 } else if (event->keyval == GDK_Return) {
474 if (!(event->state & GDK_SHIFT_MASK) 474 if ((event->state & GDK_CONTROL_MASK) && (general_options & OPT_GEN_CTL_ENTER)) {
475 && (general_options & OPT_GEN_ENTER_SENDS)) {
476 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); 475 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
477 //to stop the putting in of the enter character 476 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
477 } else if (!(event->state & GDK_SHIFT_MASK) && (general_options & OPT_GEN_ENTER_SENDS)) {
478 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
478 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); 479 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
479 } else { 480 } else {
480 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); 481 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
481 pos = gtk_editable_get_position(GTK_EDITABLE(entry)); 482 pos = gtk_editable_get_position(GTK_EDITABLE(entry));
482 gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos); 483 gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);