Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22958
Modified Files:
conversation.c
Log Message:
fine.
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- conversation.c 2001/10/09 19:18:41 1.276
+++ conversation.c 2001/10/11 07:49:02 1.277
@@ -605,10 +605,20 @@
gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
} else {
+ int oldpos;
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
- pos = gtk_editable_get_position(GTK_EDITABLE(entry));
+ oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry));
gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
+ if (oldpos == pos)
+ gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
}
+ } else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) {
+ int oldpos;
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+ oldpos = pos = gtk_editable_get_position(GTK_EDITABLE(entry));
+ gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
+ if (oldpos == pos)
+ gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
} else if (event->state & GDK_CONTROL_MASK) {
if (convo_options & OPT_CONVO_CTL_CHARS) {
switch (event->keyval) {
|