Mercurial > pidgin
changeset 32366:ae0fa8a95fd9
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.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 28 Nov 2011 08:52:34 +0000 |
| parents | 04f76a6d8888 |
| children | ca4714f51bb1 |
| files | libpurple/prefs.c pidgin/gtkprefs.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/prefs.c Mon Nov 28 08:33:30 2011 +0000 +++ b/libpurple/prefs.c Mon Nov 28 08:52:34 2011 +0000 @@ -1357,6 +1357,7 @@ 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");
--- a/pidgin/gtkprefs.c Mon Nov 28 08:33:30 2011 +0000 +++ b/pidgin/gtkprefs.c Mon Nov 28 08:52:34 2011 +0000 @@ -3041,7 +3041,6 @@ 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 @@ 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");