# HG changeset patch # User Kevin Stange # Date 1182066364 0 # Node ID 094698b04630e7efe39216735cdf9870af32fcc9 # Parent 08e639dbac99729c06257c7e12abd259d10d7a56 Based on my calculations, this comment made no sense. It is not necessary to add a pref before deleting it, and emptying the function doesn't break the API. I am also changing an instance of purple_prefs_rename() into _remove() because it would rename a preference to the one that is being removed anyway. diff -r 08e639dbac99 -r 094698b04630 libpurple/debug.c --- a/libpurple/debug.c Sun Jun 17 05:14:45 2007 +0000 +++ b/libpurple/debug.c Sun Jun 17 07:46:04 2007 +0000 @@ -183,12 +183,4 @@ 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); } diff -r 08e639dbac99 -r 094698b04630 libpurple/prefs.c --- a/libpurple/prefs.c Sun Jun 17 05:14:45 2007 +0000 +++ b/libpurple/prefs.c Sun Jun 17 07:46:04 2007 +0000 @@ -1356,6 +1356,7 @@ 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") && diff -r 08e639dbac99 -r 094698b04630 pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Sun Jun 17 05:14:45 2007 +0000 +++ b/pidgin/gtkprefs.c Sun Jun 17 07:46:04 2007 +0000 @@ -2096,7 +2096,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", @@ -2137,6 +2136,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");