# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1083900300 0
# Node ID 7a67c459ab8f758ea97792c9d57fcb3809eb384a
# Parent  d484f23cd92b6129f898c63881e2d896fee78687
[gaim-migrate @ 9669]
Move the preference renameing/removing stuff to prefs.c...
It's pretty ugly... but it was ugly before...
So now we remove the eradicated prefs.  I think.

committer: Tailor Script <tailor@pidgin.im>

diff -r d484f23cd92b -r 7a67c459ab8f src/conversation.c
--- a/src/conversation.c	Fri May 07 02:52:32 2004 +0000
+++ b/src/conversation.c	Fri May 07 03:25:00 2004 +0000
@@ -2622,6 +2622,7 @@
 	gaim_prefs_add_none("/core/conversations/im");
 	gaim_prefs_add_bool("/core/conversations/im/send_typing", TRUE);
 
+	/* Connect callbacks for changed preferences */
 	gaim_prefs_connect_callback("/core/conversations/use_alias_for_title",
 			update_titles_pref_cb, NULL);
 	gaim_prefs_connect_callback("/core/buddies/use_server_alias",
diff -r d484f23cd92b -r 7a67c459ab8f src/gtkprefs.c
--- a/src/gtkprefs.c	Fri May 07 02:52:32 2004 +0000
+++ b/src/gtkprefs.c	Fri May 07 03:25:00 2004 +0000
@@ -2968,12 +2968,3 @@
 	gaim_prefs_connect_callback("/gaim/gtk/smileys/theme",
 								smiley_theme_pref_cb, NULL);
 }
-
-void gaim_gtk_prefs_rename_old() {
-	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");
-}
diff -r d484f23cd92b -r 7a67c459ab8f src/gtkprefs.h
--- a/src/gtkprefs.h	Fri May 07 02:52:32 2004 +0000
+++ b/src/gtkprefs.h	Fri May 07 03:25:00 2004 +0000
@@ -107,9 +107,4 @@
 		const gchar * title, GaimPrefType type, const char *key,
 		GList *menuitems);
 
-/**
- * Rename legacy prefs
- */
-void gaim_gtk_prefs_rename_old();
-
 #endif /* _GAIM_GTK_PREFS_H_ */
diff -r d484f23cd92b -r 7a67c459ab8f src/main.c
--- a/src/main.c	Fri May 07 02:52:32 2004 +0000
+++ b/src/main.c	Fri May 07 03:25:00 2004 +0000
@@ -853,7 +853,7 @@
 
 	gaim_prefs_load();
 
-	gaim_gtk_prefs_rename_old();
+	gaim_prefs_update_old();
 
 	/* load plugins we had when we quit */
 	gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
diff -r d484f23cd92b -r 7a67c459ab8f src/prefs.c
--- a/src/prefs.c	Fri May 07 02:52:32 2004 +0000
+++ b/src/prefs.c	Fri May 07 03:25:00 2004 +0000
@@ -982,3 +982,19 @@
 	return TRUE;
 }
 
+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");
+}
diff -r d484f23cd92b -r 7a67c459ab8f src/prefs.h
--- a/src/prefs.h	Fri May 07 02:52:32 2004 +0000
+++ b/src/prefs.h	Fri May 07 03:25:00 2004 +0000
@@ -240,6 +240,11 @@
  */
 void gaim_prefs_sync();
 
+/**
+ * Rename legacy prefs and delete some that no longer exist.
+ */
+void gaim_prefs_update_old();
+
 /*@}*/
 
 #ifdef __cplusplus