Mercurial > pidgin

diff src/gtknotify.c @ 9596:7b3212aa698c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 cb7f26f30d02
children d9e6e172f94c
line wrap: on
line diff
--- a/src/gtknotify.c	Sun Jul 25 22:44:44 2004 +0000
+++ b/src/gtknotify.c	Sun Jul 25 22:47:11 2004 +0000
@@ -365,20 +365,12 @@
 
 
 	/* Add the text to the gtkimhtml */
-#if 1 /* PREFSLASH04 */
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_colors"))
 		options ^= GTK_IMHTML_NO_COLOURS;
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_fonts"))
 		options ^= GTK_IMHTML_NO_FONTS;
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes"))
 		options ^= GTK_IMHTML_NO_SIZES;
-#else
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) {
-		options ^= GTK_IMHTML_NO_COLOURS;
-		options ^= GTK_IMHTML_NO_FONTS;
-		options ^= GTK_IMHTML_NO_SIZES;
-	}
-#endif
 
 	options ^= GTK_IMHTML_NO_COMMENTS;
 	options ^= GTK_IMHTML_NO_TITLE;