Index: src/main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.121
diff -u -p -u -r1.121 main.c
--- src/main.c	7 May 2004 03:25:00 -0000	1.121
+++ src/main.c	8 May 2004 15:21:13 -0000
@@ -854,6 +854,7 @@ int main(int argc, char *argv[])
 	gaim_prefs_load();
 
 	gaim_prefs_update_old();
+	gaim_gtk_prefs_update_old();
 
 	/* load plugins we had when we quit */
 	gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
Index: src/prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.429
diff -u -p -u -r1.429 prefs.c
--- src/prefs.c	7 May 2004 03:25:00 -0000	1.429
+++ src/prefs.c	8 May 2004 15:21:13 -0000
@@ -983,18 +983,7 @@ gboolean gaim_prefs_load() {
 }
 
 void gaim_prefs_update_old() {
-	/* Rename some old prefs */
-	gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims");
-	gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats");
-	gaim_prefs_rename("/core/conversations/placement",
-					  "/gaim/gtk/conversations/placement");  
-	gaim_prefs_rename_boolean_toggle("/gaim/gtk/sound/silent_signon",
-									 "/gaim/gtk/sound/signon");
-
 	/* Remove some no-longer-used prefs */
 	gaim_prefs_remove("/core/conversations/im/show_login");
 	gaim_prefs_remove("/core/conversations/send_urls_as_links");
-	gaim_prefs_remove("/gaim/gtk/conversations/im/hide_on_send");
-	gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links");
-	gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
 }
Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.151
diff -u -p -u -r1.151 gtkprefs.c
--- src/gtkprefs.c	7 May 2004 03:25:00 -0000	1.151
+++ src/gtkprefs.c	8 May 2004 15:21:13 -0000
@@ -2968,3 +2968,17 @@ gaim_gtk_prefs_init(void)
 	gaim_prefs_connect_callback("/gaim/gtk/smileys/theme",
 								smiley_theme_pref_cb, NULL);
 }
+
+void gaim_gtk_prefs_update_old() {
+	/* Rename some old prefs */
+	gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims");
+	gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats");
+	gaim_prefs_rename("/core/conversations/placement",
+					  "/gaim/gtk/conversations/placement");  
+	gaim_prefs_rename_boolean_toggle("/gaim/gtk/sound/silent_signon",
+									 "/gaim/gtk/sound/signon");
+
+	/* Remove some no-longer-used prefs */
+	gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links");
+	gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
+}
Index: src/gtkprefs.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.h,v
retrieving revision 1.11
diff -u -p -r1.11 gtkprefs.h
--- src/gtkprefs.h	7 May 2004 03:25:00 -0000	1.11
+++ src/gtkprefs.h	8 May 2004 17:43:16 -0000
@@ -107,4 +107,9 @@ GtkWidget *gaim_gtk_prefs_dropdown_from_
 		const gchar * title, GaimPrefType type, const char *key,
 		GList *menuitems);
 
+/**
+ * Rename legacy GTK prefs and delete some that no longer exist.
+ */
+void gaim_gtk_prefs_update_old();
+
 #endif /* _GAIM_GTK_PREFS_H_ */