# HG changeset patch # User William Ehlhardt # Date 1180043222 0 # Node ID 752d16a0de51e8912b096f8feeb9b148259253dd # Parent 3bccbafea8c13c6822f119555d30517893ef77ff# Parent e88994a3f13b9183bef270fa173fecbde3756371 propagate from branch 'im.pidgin.pidgin' (head a1c04042b2aa9af25eb7fd9dd61735303e6d11a0) to branch 'im.pidgin.soc.2007.certmgr' (head 8967bf2b17e244e97aad092f9794e6b19d992c55) diff -r 3bccbafea8c1 -r 752d16a0de51 libpurple/debug.c --- a/libpurple/debug.c Thu May 24 21:45:27 2007 +0000 +++ b/libpurple/debug.c Thu May 24 21:47:02 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 3bccbafea8c1 -r 752d16a0de51 libpurple/protocols/jabber/google.c --- a/libpurple/protocols/jabber/google.c Thu May 24 21:45:27 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Thu May 24 21:47:02 2007 +0000 @@ -219,7 +219,7 @@ const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster"); const char *subscription = xmlnode_get_attrib(item, "subscription"); - if (!strcmp(subscription, "none")) { + if (subscription && !strcmp(subscription, "none")) { /* The Google Talk servers will automatically add people from your Gmail address book * with subscription=none. If we see someone with subscription=none, ignore them. */ diff -r 3bccbafea8c1 -r 752d16a0de51 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Thu May 24 21:45:27 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu May 24 21:47:02 2007 +0000 @@ -999,8 +999,10 @@ } else { - fputs("\n" - "\n" +#ifdef _WIN32 + fputs("\n", fd); +#endif + fputs("\n" "\n" "