comparison src/gtkconv.c @ 9049:f01eef2c264a

[gaim-migrate @ 9825] Split Ignore Formatting into Ignore Font, Ignore Colors and whatever else. Is that cool? I was never really comfortable with removing this in the first place. Someone should test this. G'night. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 24 May 2004 04:29:40 +0000
parents f2f8a56acdb6
children 717d0e23f5fa
comparison
equal deleted inserted replaced
9048:f2f8a56acdb6 9049:f01eef2c264a
4585 if(gc) 4585 if(gc)
4586 sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->info->name); 4586 sml_attrib = g_strdup_printf("sml=\"%s\"", gc->prpl->info->name);
4587 4587
4588 gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; 4588 gtk_font_options ^= GTK_IMHTML_NO_COMMENTS;
4589 4589
4590 #if 1 /* PREFSLASH04 */
4591 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors"))
4592 gtk_font_options ^= GTK_IMHTML_NO_COLOURS;
4593 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts"))
4594 gtk_font_options ^= GTK_IMHTML_NO_FONTS;
4595 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes"))
4596 gtk_font_options ^= GTK_IMHTML_NO_SIZES;
4597 #else
4590 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) { 4598 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) {
4591 gtk_font_options ^= GTK_IMHTML_NO_COLOURS; 4599 gtk_font_options ^= GTK_IMHTML_NO_COLOURS;
4592 gtk_font_options ^= GTK_IMHTML_NO_FONTS; 4600 gtk_font_options ^= GTK_IMHTML_NO_FONTS;
4593 gtk_font_options ^= GTK_IMHTML_NO_SIZES; 4601 gtk_font_options ^= GTK_IMHTML_NO_SIZES;
4594 } 4602 }
4603 #endif
4595 4604
4596 /* this is gonna crash one day, I can feel it. */ 4605 /* this is gonna crash one day, I can feel it. */
4597 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & 4606 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options &
4598 OPT_PROTO_USE_POINTSIZE) { 4607 OPT_PROTO_USE_POINTSIZE) {
4599 gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE; 4608 gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE;
5782 gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE); 5791 gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);
5783 gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE); 5792 gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE);
5784 gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE); 5793 gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE);
5785 gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE); 5794 gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE);
5786 gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE); 5795 gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE);
5796 #if 1
5797 gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_colors", FALSE);
5798 gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_fonts", FALSE);
5799 gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_font_sizes", FALSE);
5800 #else
5787 gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_formatting", FALSE); 5801 gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_formatting", FALSE);
5802 #endif
5788 gaim_prefs_add_bool("/gaim/gtk/conversations/html_shortcuts", FALSE); 5803 gaim_prefs_add_bool("/gaim/gtk/conversations/html_shortcuts", FALSE);
5789 gaim_prefs_add_bool("/gaim/gtk/conversations/smiley_shortcuts", FALSE); 5804 gaim_prefs_add_bool("/gaim/gtk/conversations/smiley_shortcuts", FALSE);
5790 gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE); 5805 gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
5791 gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last"); 5806 gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
5792 gaim_prefs_add_int("/gaim/gtk/conversations/placement_number", 1); 5807 gaim_prefs_add_int("/gaim/gtk/conversations/placement_number", 1);