# HG changeset patch # User Richard Laager # Date 1180036071 0 # Node ID 977b9adc2757ded006b6b4b208ca7d3d1acf080b # Parent 5d95cdb20ec4be295d13ebc5110c788311dbe24b# Parent 3cc729673b62dc26f22d1c37ff6c0111d1153a75 merge of 'ccfb422853c34c69e2172bffd83d4c62bacca89c' and 'ef3e4adbf5a904e6351d0122128e7d01e251545f' diff -r 5d95cdb20ec4 -r 977b9adc2757 libpurple/debug.c --- a/libpurple/debug.c Thu May 24 19:06:01 2007 +0000 +++ b/libpurple/debug.c Thu May 24 19:47:51 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 5d95cdb20ec4 -r 977b9adc2757 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Thu May 24 19:06:01 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu May 24 19:47:51 2007 +0000 @@ -999,8 +999,10 @@ } else { - fputs("\n" - "\n" +#ifdef _WIN32 + fputs("\n", fd); +#endif + fputs("\n" "\n" "