Mercurial > pidgin
changeset 25694:b955681d9597
merge of '971ab963635fdaf00d7a3a11affd22666eef29fa'
and 'a5a44e4c8abce36bd3e6d473029e6a68faed8e0d'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Fri, 06 Feb 2009 22:07:57 +0000 |
| parents | a8224eb86581 (current diff) ebd63c4f9405 (diff) |
| children | e3f2b16f75da |
| files | |
| diffstat | 3 files changed, 20 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Fri Feb 06 22:07:50 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Fri Feb 06 22:07:57 2009 +0000 @@ -597,8 +597,6 @@ } } - purple_debug_info("jabber", "got %d seconds idle from presence\n", idle); - if (idle && delayed && stamp) { /* if we have a delayed presence, we need to add the delay to the idle value */ @@ -608,7 +606,6 @@ stamp, offset); idle += offset; } - if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) { static int i = 1;
--- a/libpurple/protocols/msn/soap.c Fri Feb 06 22:07:50 2009 +0000 +++ b/libpurple/protocols/msn/soap.c Fri Feb 06 22:07:57 2009 +0000 @@ -342,12 +342,14 @@ } if (fault || body) { - MsnSoapRequest *request = conn->current_request; - conn->current_request = NULL; - request->cb(request->message, response, - request->cb_data); + if (conn->current_request) { + MsnSoapRequest *request = conn->current_request; + conn->current_request = NULL; + request->cb(request->message, response, + request->cb_data); + msn_soap_request_destroy(request, FALSE); + } msn_soap_message_destroy(response); - msn_soap_request_destroy(request, FALSE); } return TRUE;
--- a/libpurple/protocols/oscar/oscar.h Fri Feb 06 22:07:50 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.h Fri Feb 06 22:07:57 2009 +0000 @@ -286,6 +286,15 @@ "us", "en", \ } +#define CLIENTINFO_ICQBASIC_14_34_3096 { \ + "ICQBasic", \ + 0x010a, \ + 0x0014, 0x0034, \ + 0x0000, 0x0c18, \ + 0x0000043d, \ + "us", "en", \ +} + #define CLIENTINFO_NETSCAPE_7_0_1 { \ "Netscape 2000 an approved user of AOL Instant Messenger (SM)", \ 0x1d0d, \ @@ -312,14 +321,14 @@ #define CLIENTINFO_PURPLE_ICQ { \ "Purple/" VERSION, \ 0x010a, \ - 0x0006, 0x0000, \ - 0x0000, 0x17ab, \ - 0x00007535, \ + 0x0014, 0x0034, \ + 0x0000, 0x0c18, \ + 0x0000043d, \ "us", "en", \ } #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036 -#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3000 +#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096 typedef enum {