# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 965175237 0
# Node ID a33616e4e48d8a1755d5ff84c4262acb3262d701
# Parent  0aca48e1baa790c2bbadca6015a12a2ca4c790c6
[gaim-migrate @ 585]
ctl-u is optional, one that i don't think i'll use, thank you

committer: Tailor Script <tailor@pidgin.im>

diff -r 0aca48e1baa7 -r a33616e4e48d src/conversation.c
--- a/src/conversation.c	Tue Aug 01 23:50:32 2000 +0000
+++ b/src/conversation.c	Wed Aug 02 00:13:57 2000 +0000
@@ -464,7 +464,8 @@
 			pos=gtk_editable_get_position(GTK_EDITABLE(entry));
 			gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
 		}
-	} else if (event->state & GDK_CONTROL_MASK) {
+	} else if ((event->state & GDK_CONTROL_MASK)
+		   && (general_options & OPT_GEN_CTL_CHARS)) {
 		switch (event->keyval) {
 		case 'i':
 			quiet_set(c->italic, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->italic)));
diff -r 0aca48e1baa7 -r a33616e4e48d src/gaim.h
--- a/src/gaim.h	Tue Aug 01 23:50:32 2000 +0000
+++ b/src/gaim.h	Wed Aug 02 00:13:57 2000 +0000
@@ -404,7 +404,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 579 $"
+#define REVISION "gaim:$Revision: 585 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -484,6 +484,7 @@
 #define OPT_GEN_POPUP_CHAT	0x00010000
 #define OPT_GEN_BACK_ON_IM	0x00020000
 #define OPT_GEN_USE_OSCAR	0x00040000
+#define OPT_GEN_CTL_CHARS	0x00080000
 extern int USE_OSCAR;
 
 extern int display_options;
diff -r 0aca48e1baa7 -r a33616e4e48d src/prefs.c
--- a/src/prefs.c	Tue Aug 01 23:50:32 2000 +0000
+++ b/src/prefs.c	Wed Aug 02 00:13:57 2000 +0000
@@ -381,6 +381,7 @@
 
         
 	gaim_button(_("Enter sends message"), &general_options, OPT_GEN_ENTER_SENDS, genbox);
+	gaim_button(_("Control characters for HTML (e.g. Ctrl-I for italics)"), &general_options, OPT_GEN_CTL_CHARS, genbox);
 	gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, genbox);
 	gaim_button(_("Log All Conversations"), &general_options, OPT_GEN_LOG_ALL, genbox);
 	gaim_button(_("Strip HTML from log files"), &general_options, OPT_GEN_STRIP_HTML, genbox);