comparison src/gtkconv.c @ 9596:7b3212aa698c

[gaim-migrate @ 10439] Tidy up after some un-prefslashing. Also, I think I forgot to commit gtkprefs.c earlier? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 25 Jul 2004 22:47:11 +0000
parents bb722a784568
children d6f398e80b32
comparison
equal deleted inserted replaced
9595:7541a9bee2cd 9596:7b3212aa698c
5025 if(gc) 5025 if(gc)
5026 sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->info->name); 5026 sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->info->name);
5027 5027
5028 gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; 5028 gtk_font_options ^= GTK_IMHTML_NO_COMMENTS;
5029 5029
5030 #if 1 /* PREFSLASH04 */
5031 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors")) 5030 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors"))
5032 gtk_font_options ^= GTK_IMHTML_NO_COLOURS; 5031 gtk_font_options ^= GTK_IMHTML_NO_COLOURS;
5033 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts")) 5032 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts"))
5034 gtk_font_options ^= GTK_IMHTML_NO_FONTS; 5033 gtk_font_options ^= GTK_IMHTML_NO_FONTS;
5035 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes")) 5034 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes"))
5036 gtk_font_options ^= GTK_IMHTML_NO_SIZES; 5035 gtk_font_options ^= GTK_IMHTML_NO_SIZES;
5037 #else
5038 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) {
5039 gtk_font_options ^= GTK_IMHTML_NO_COLOURS;
5040 gtk_font_options ^= GTK_IMHTML_NO_FONTS;
5041 gtk_font_options ^= GTK_IMHTML_NO_SIZES;
5042 }
5043 #endif
5044 5036
5045 /* this is gonna crash one day, I can feel it. */ 5037 /* this is gonna crash one day, I can feel it. */
5046 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & 5038 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options &
5047 OPT_PROTO_USE_POINTSIZE) { 5039 OPT_PROTO_USE_POINTSIZE) {
5048 gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE; 5040 gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE;