diff src/gaimrc.c @ 9025:b24967757d46

[gaim-migrate @ 9801] " - Fixed text-decoration: underline; parsing from being dependent on font-size specified - IM HTML Toolbar dialogs now automatically fill with the color/font for the current text - Made most of the IMHTML formatting buttons fire signals where appropriate - Implemented a global on or off "Send default formatting with outgoing messages" option - If user previously sent a font name, we assume they want formatting on, otherwise it defaults to off. - Removed font and color from the GaimGtkConversation struct, because this wasn't being used anywhere, by anything and just resulted in more confusing code. - Removed three functions related to the struct, including one that was declared, but never actually written. - Added get_current_fontface, get_current_fontsize, get_current_forecolor, get_current_backcolor to gtk_imhtml_* to get the formatting at the cursor (or whole buffer when wbfo is on) - Removed all dialogs used only by the old default formatting preferences from dialogs.c - When font background, color, or face are "disabled" they are stored as an empty string in their prefs. - Fixed a bug where NULL for background, color, or face did not remove the tags in wbfo " all that, quoth SimGuy committer: Tailor Script <[e-mail]>

--- a/src/gaimrc.c	Sun May 23 02:42:01 2004 +0000
+++ b/src/gaimrc.c	Sun May 23 03:54:20 2004 +0000
@@ -46,14 +46,12 @@
 #define BORING_DEFAULT_AWAY_MSG _("sorry, i ran out for a while. bbl")
 #define MAX_VALUES 10
 
+/* We're going to ignore strikethough and assume "custom font"
+   means to send custom formatting */
 #define OPT_FONT_BOLD			0x00000001
 #define OPT_FONT_ITALIC			0x00000002
 #define OPT_FONT_UNDERLINE		0x00000008
-/* We're going to ignore strikethough */
 #define OPT_FONT_FACE			0x00000020
-#define OPT_FONT_FGCOL			0x00000040
-#define OPT_FONT_BGCOL			0x00000080
-#define OPT_FONT_SIZE			0x00000100
 
 #define OPT_MISC_DEBUG			0x00000001
 #define OPT_MISC_BROWSER_POPUP		0x00000002
@@ -1061,14 +1059,8 @@
 					font_options & OPT_FONT_ITALIC);
 			gaim_prefs_set_bool("/gaim/gtk/conversations/send_underline",
 					font_options & OPT_FONT_UNDERLINE);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_font",
+			gaim_prefs_set_bool("/gaim/gtk/conversations/send_formatting",
 					font_options & OPT_FONT_FACE);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_size",
-					font_options & OPT_FONT_SIZE);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_fgcolor",
-					font_options & OPT_FONT_FGCOL);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_bgcolor",
-					font_options & OPT_FONT_BGCOL);
 
 		} else if (!strcmp(p->option, "sound_options")) {
 			sound_options = atoi(p->value[0]);