# HG changeset patch # User Sadrul Habib Chowdhury # Date 1180043253 0 # Node ID b7fa0e44d723b6513e09829c59fefe9241c1ea4d # Parent 319bcb73eb4e53ba3480d8954e132e064594b053# Parent e88994a3f13b9183bef270fa173fecbde3756371 merge of '82aa02e0b2bd8284accf4fd32088facc9e4d033d' and 'a1c04042b2aa9af25eb7fd9dd61735303e6d11a0' diff -r 319bcb73eb4e -r b7fa0e44d723 libpurple/debug.c --- a/libpurple/debug.c Thu May 24 21:15:16 2007 +0000 +++ b/libpurple/debug.c Thu May 24 21:47:33 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 319bcb73eb4e -r b7fa0e44d723 libpurple/protocols/jabber/google.c --- a/libpurple/protocols/jabber/google.c Thu May 24 21:15:16 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Thu May 24 21:47:33 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 319bcb73eb4e -r b7fa0e44d723 libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c Thu May 24 21:15:16 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Thu May 24 21:47:33 2007 +0000 @@ -999,8 +999,10 @@ } else { - fputs("\n" - "\n" +#ifdef _WIN32 + fputs("\n", fd); +#endif + fputs("\n" "\n" "