# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1103461049 0
# Node ID de59c0e7f87ebbb88f6705e1d02ca88c665c59c2
# Parent  566177590bd52493f374c0f7d21656fab109410d
[gaim-migrate @ 11628]
Remove a rogue reference to the slashed 'color_nicks' pref, and make sure some
other slashed prefs are actually removed to prevent too much clutter in prefs.xml

committer: Tailor Script <tailor@pidgin.im>

diff -r 566177590bd5 -r de59c0e7f87e src/gtkconv.c
--- a/src/gtkconv.c	Sun Dec 19 02:00:44 2004 +0000
+++ b/src/gtkconv.c	Sun Dec 19 12:57:29 2004 +0000
@@ -4656,8 +4656,7 @@
 		}
 	}
 
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/chat/color_nicks"))
-		flags |= GAIM_MESSAGE_COLORIZE;
+	flags |= GAIM_MESSAGE_COLORIZE;
 
 	gaim_conversation_write(conv, who, message, flags, mtime);
 }
diff -r 566177590bd5 -r de59c0e7f87e src/gtkprefs.c
--- a/src/gtkprefs.c	Sun Dec 19 02:00:44 2004 +0000
+++ b/src/gtkprefs.c	Sun Dec 19 12:57:29 2004 +0000
@@ -2335,29 +2335,32 @@
 	gaim_prefs_rename("/gaim/gtk/debug/timestamps", "/core/debug/timestamps");
 
 	/* Remove some no-longer-used prefs */
+	gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts");
 	gaim_prefs_remove("/gaim/gtk/blist/button_style");
 	gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies");
 	gaim_prefs_remove("/gaim/gtk/blist/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
-	gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts");
 	gaim_prefs_remove("/gaim/gtk/blist/show_idle_time");
 	gaim_prefs_remove("/gaim/gtk/blist/show_warning_level");
 	gaim_prefs_remove("/gaim/gtk/conversations/button_type");
+	gaim_prefs_remove("/gaim/gtk/conversations/ctrl_enter_sends");
+	gaim_prefs_remove("/gaim/gtk/conversations/enter_sends");
 	gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts");
 	gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
+	gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
+	gaim_prefs_remove("/gaim/gtk/conversations/show_timestamps");
 	gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links");
-	gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
 	gaim_prefs_remove("/gaim/gtk/conversations/smiley_shortcuts");
-	gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");
-	gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
-	gaim_prefs_remove("/gaim/gtk/conversations/im/raise_on_events");
-	gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
-	gaim_prefs_remove("/gaim/gtk/conversations/show_timestamps");
-	gaim_prefs_remove("/gaim/gtk/sound/signon");
-	gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
-	gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_bgcolor");
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_fgcolor");
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_size");
+	gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
+	gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");
 	gaim_prefs_remove("/gaim/gtk/conversations/im/hide_on_send");
+	gaim_prefs_remove("/gaim/gtk/conversations/im/raise_on_events");
+	gaim_prefs_remove("/gaim/gtk/conversations/chat/color_nicks");
+	gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
+	gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
+	gaim_prefs_remove("/gaim/gtk/sound/signon");
+	gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
 }