diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2009-02-04 08:28:14 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2009-02-04 08:28:14 +0000 |
| commit | 4e6cd652b4bdf5efa0c87c92a82fdde64a058acf (patch) | |
| tree | ff79392f3a53deb363837143d047382e9ad30640 | |
| parent | da367b5eae9193eda28eac684ba0bc24827c16e7 (diff) | |
| parent | b36422d05eaf9a00cddf63d3872f970195994e4b (diff) | |
| download | pidgin-4e6cd652b4bdf5efa0c87c92a82fdde64a058acf.tar.gz | |
merge of 'ed37c7a05f8a75ed2a647dd5bc2c0e5a2d8ca7e4'
and '6e37eebd146d7b36bc0f97fc04fa32de28cc6595'
| -rw-r--r-- | libpurple/protocols/jabber/presence.c | 3 | ||||
| -rw-r--r-- | libpurple/protocols/msn/soap.c | 12 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/oscar.h | 17 |
3 files changed, 20 insertions, 12 deletions
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c index 9defd0cfa5..09ddd0901d 100644 --- a/libpurple/protocols/jabber/presence.c +++ b/libpurple/protocols/jabber/presence.c @@ -597,8 +597,6 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet) } } - 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 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet) stamp, offset); idle += offset; } - if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) { static int i = 1; diff --git a/libpurple/protocols/msn/soap.c b/libpurple/protocols/msn/soap.c index 9b42a7397e..b986562272 100644 --- a/libpurple/protocols/msn/soap.c +++ b/libpurple/protocols/msn/soap.c @@ -342,12 +342,14 @@ msn_soap_handle_body(MsnSoapConnection *conn, MsnSoapMessage *response) } 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; diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h index 487d137e1f..ce29d8e004 100644 --- a/libpurple/protocols/oscar/oscar.h +++ b/libpurple/protocols/oscar/oscar.h @@ -286,6 +286,15 @@ struct _ClientInfo "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 @@ struct _ClientInfo #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 { |