# HG changeset patch # User William Ehlhardt # Date 1180033417 0 # Node ID 3cc729673b62dc26f22d1c37ff6c0111d1153a75 # Parent f9c17090f347578ee9e9ae1cf8635637f30efe07# Parent 591d6c3e9f1fc1ffcbf5877286b160bf89a81b51 merge of '90b477e6a3033c1714b2edc257b23c40c97b145e' and 'ea661741df144ed6b0c9a3198b6ed236f0e574c2' diff -r f9c17090f347 -r 3cc729673b62 libpurple/debug.c --- a/libpurple/debug.c Thu May 24 18:55:19 2007 +0000 +++ b/libpurple/debug.c Thu May 24 19:03:37 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); } diff -r f9c17090f347 -r 3cc729673b62 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Thu May 24 18:55:19 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu May 24 19:03:37 2007 +0000 @@ -999,8 +999,10 @@ } else { - fputs("\n" - "\n" +#ifdef _WIN32 + fputs("\n", fd); +#endif + fputs("\n" "\n" "