Mercurial > pidgin.yaz
changeset 18156:82c7ae86d92c
disapproval of revision '8252394105eb4f981e17cec193e039dc94dfbde1'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 17 Jun 2007 14:33:41 +0000 |
| parents | 094698b04630 |
| children | c4518bbca240 |
| files | libpurple/debug.c libpurple/prefs.c pidgin/gtkprefs.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/debug.c Sun Jun 17 07:46:04 2007 +0000 +++ b/libpurple/debug.c Sun Jun 17 14:33:41 2007 +0000 @@ -183,4 +183,12 @@ void purple_debug_init(void) { + purple_prefs_add_none("/purple/debug"); + + /* + * This pref is obsolete and no longer referenced anywhere. It only + * survives here because it would be an API break if we removed it. + * Remove this when we get to 3.0.0 :) + */ + purple_prefs_add_bool("/purple/debug/timestamps", TRUE); }
--- a/libpurple/prefs.c Sun Jun 17 07:46:04 2007 +0000 +++ b/libpurple/prefs.c Sun Jun 17 14:33:41 2007 +0000 @@ -1356,7 +1356,6 @@ purple_prefs_remove("/plugins/core/autorecon/restore_state"); purple_prefs_remove("/plugins/core/autorecon"); purple_prefs_remove("/purple/debug/timestamps"); - purple_prefs_remove("/purple/debug"); /* Convert old sounds while_away pref to new 3-way pref. */ if (purple_prefs_exists("/purple/sound/while_away") &&
--- a/pidgin/gtkprefs.c Sun Jun 17 07:46:04 2007 +0000 +++ b/pidgin/gtkprefs.c Sun Jun 17 14:33:41 2007 +0000 @@ -2096,6 +2096,7 @@ 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", @@ -2136,7 +2137,6 @@ 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");