Mercurial > pidgin
changeset 27648:6e952b8b3672
merge of '13c5077bcfd832ab1e88f6b32c9563e6d46ebf82'
and '8f9a140783faca52a82e4844a2ae53fee7137282'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Jul 2009 18:29:16 +0000 |
| parents | 8b669aaa3ed7 (diff) 8de82ce7de5c (current diff) |
| children | bbce09a8e5a5 |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Mon Jul 20 07:12:34 2009 +0000 +++ b/libpurple/dnsquery.c Mon Jul 20 18:29:16 2009 +0000 @@ -771,8 +771,8 @@ query_data = data; #ifdef USE_IDN - if (!dns_str_is_ascii(dns_params.hostname)) { - rc = purple_network_convert_idn_to_ascii(dns_params.hostname, &hostname); + if (!dns_str_is_ascii(query_data->hostname)) { + rc = purple_network_convert_idn_to_ascii(query_data->hostname, &hostname); if (rc != 0) { /* FIXME: Dirty 2.6.0 string freeze hack */ char tmp[8]; @@ -785,7 +785,7 @@ } } else /* intentional fallthru */ #endif - hostname = g_strdup(dns_params.hostname); + hostname = g_strdup(query_data->hostname); #ifdef HAVE_GETADDRINFO g_snprintf(servname, sizeof(servname), "%d", query_data->port);
--- a/libpurple/protocols/jabber/jutil.c Mon Jul 20 07:12:34 2009 +0000 +++ b/libpurple/protocols/jabber/jutil.c Mon Jul 20 18:29:16 2009 +0000 @@ -153,6 +153,8 @@ jid = NULL; /* goto out; */ } + + jid->resource = g_strdup(idn_buffer); } out:
--- a/libpurple/protocols/jabber/message.c Mon Jul 20 07:12:34 2009 +0000 +++ b/libpurple/protocols/jabber/message.c Mon Jul 20 18:29:16 2009 +0000 @@ -790,6 +790,10 @@ handle_buzz(jm); switch(jm->type) { + case JABBER_MESSAGE_OTHER: + purple_debug(PURPLE_DEBUG_INFO, "jabber", + "Received message of unknown type: %s\n", type); + /* Fall-through is intentional */ case JABBER_MESSAGE_NORMAL: case JABBER_MESSAGE_CHAT: handle_chat(jm); @@ -809,10 +813,6 @@ case JABBER_MESSAGE_ERROR: handle_error(jm); break; - case JABBER_MESSAGE_OTHER: - purple_debug(PURPLE_DEBUG_INFO, "jabber", - "Received message of unknown type: %s\n", type); - break; } jabber_message_free(jm); }