Mercurial > pidgin.yaz
changeset 25966:7741759e741a
propagate from branch 'im.pidgin.pidgin' (head 3224dd8677b28d02b866cce510941fbf67e0fcb7)
to branch 'im.pidgin.cpw.malu.xmpp.idle' (head 9dfa59217f19d3a885590a66ec6faca4e8b568a2)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 02 Feb 2009 22:51:52 +0000 |
| parents | 0f2503390a6b (diff) c5d2559d6e0d (current diff) |
| children | a9b078297b69 |
| files | |
| diffstat | 2 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/soap.c Sun Feb 01 19:43:13 2009 +0000 +++ b/libpurple/protocols/msn/soap.c Mon Feb 02 22:51:52 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 Sun Feb 01 19:43:13 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.h Mon Feb 02 22:51:52 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 {