# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1135220113 0
# Node ID 0124220c757568ee1ae9379161b9575d3d89e0fc
# Parent  4c7e5eb7c09d20cff98fccddd83eb416985b3bdb
[gaim-migrate @ 14948]
Remove a 2.0.0cvs pref transition. This shouldn't be necessary any more.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4c7e5eb7c09d -r 0124220c7575 src/gtkprefs.c
--- a/src/gtkprefs.c	Thu Dec 22 02:41:36 2005 +0000
+++ b/src/gtkprefs.c	Thu Dec 22 02:55:13 2005 +0000
@@ -1911,12 +1911,8 @@
 	gaim_prefs_rename("/gaim/gtk/debug/timestamps", "/core/debug/timestamps");
 	gaim_prefs_rename("/gaim/gtk/conversations/im/raise_on_events", "/plugins/gtk/X11/notify/method_raise");
 
-	/* I'm leaving both of these to support people that were running 2.0.0cvs before this change.
-	 * The latter can be removed before 2.0.0 is released, or after that if it's forgotten. */
 	gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_colors",
 									 "/gaim/gtk/conversations/show_incoming_formatting");
-	gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_formatting",
-									 "/gaim/gtk/conversations/show_incoming_formatting");
 
 	/* this string pref moved into the core, try to be friendly */
 	gaim_prefs_rename("/gaim/gtk/idle/reporting_method", "/core/away/idle_reporting");