pidgin: 8ee87bdc: We haven't used this pref in a while. W...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 8ee87bdc7a99e5d58bf700eaf08abe409ae4ede8
Parent:   bc2dca737776fdbc94632eb6a1b3b2daed290c78
Author:   markdoliner at pidgin.im
Date:     11/28/11 03:52:34
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8ee87bdc7a99e5d58bf700eaf08abe409ae4ede8

Changelog: 

We haven't used this pref in a while.  We stopped adding it in
revision 106592f58365ca74fb7446ca751df08904021b9d.  We also need
to stop trying to rename it, and we should remove it if it
exists.

For 3.0.0 we should go through the prefs that we're migrating and
removing and stop migrating/removing them if we've been doing it
since before 2.0.0.

Changes against parent bc2dca737776fdbc94632eb6a1b3b2daed290c78

  patched  libpurple/prefs.c
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- libpurple/prefs.c	29d1bfb642ae090250dbcee59fd2e1890cb195c3
+++ libpurple/prefs.c	17df0f4f211fa4bfef39b697369c37e86fc9499c
@@ -1357,6 +1357,7 @@ purple_prefs_update_old()
 	purple_prefs_remove("/purple/conversations/chat/show_leave");
 	purple_prefs_remove("/purple/conversations/combine_chat_im");
 	purple_prefs_remove("/purple/conversations/use_alias_for_title");
+	purple_prefs_remove("/purple/debug/timestamps");
 	purple_prefs_remove("/purple/logging/log_signon_signoff");
 	purple_prefs_remove("/purple/logging/log_idle_state");
 	purple_prefs_remove("/purple/logging/log_away_state");
============================================================
--- pidgin/gtkprefs.c	9d7a4a762fc0670fdf5a94196c03ba53750b2cf7
+++ pidgin/gtkprefs.c	d9f7e1ca860271128000eb2a86161a7ea97003e9
@@ -3041,7 +3041,6 @@ pidgin_prefs_update_old(void)
 	purple_prefs_rename("/purple/conversations/placement",
 					  PIDGIN_PREFS_ROOT "/conversations/placement");
 
-	purple_prefs_rename(PIDGIN_PREFS_ROOT "/debug/timestamps", "/purple/debug/timestamps");
 	purple_prefs_rename(PIDGIN_PREFS_ROOT "/conversations/im/raise_on_events", "/plugins/gtk/X11/notify/method_raise");
 
 	purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors",
@@ -3087,6 +3086,7 @@ pidgin_prefs_update_old(void)
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_fonts");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_font_sizes");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/passthrough_unknown_commands");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/debug/timestamps");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/idle");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/logging/individual_logs");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/signon");