pidgin: d6650bbc: Compile
rlaager at pidgin.im
rlaager at pidgin.im
Wed Nov 26 17:51:08 EST 2008
-----------------------------------------------------------------
Revision: d6650bbce66004cf205e9f60ef96626783db72e8
Ancestor: 2ee32f4f1f50a3e3c9038487554b4cfa22507df0
Author: rlaager at pidgin.im
Date: 2008-11-26T22:13:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d6650bbce66004cf205e9f60ef96626783db72e8
Modified files:
libpurple/protocols/zephyr/zephyr.c
ChangeLog:
Compile
-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/zephyr.c 51f9269b1cf033579ca154bd4e90affcdef0802d
+++ libpurple/protocols/zephyr/zephyr.c 608fd555e43256fd3288b3335e1a0d0ae860d67a
@@ -348,7 +348,7 @@ static gchar *zephyr_recv_convert(Purple
gchar *utf8;
GError *err = NULL;
zephyr_account *zephyr = gc->proto_data;
- if (g_utf8_validate(string, len, NULL)) {
+ if (g_utf8_validate(string, -1, NULL)) {
return g_strdup(string);
} else {
utf8 = g_convert(string, -1, "UTF-8", zephyr->encoding, NULL, NULL, &err);
@@ -896,7 +896,7 @@ static void handle_message(PurpleConnect
#ifndef INET_ADDRSTRLEN
#define INET_ADDRSTRLEN 16
#endif
- if (!purple_conv_chat_find_user(gcc, sendertmp)) {
+ if (!purple_conv_chat_find_user(gcc, stripped_sender)) {
gchar ipaddr[INET_ADDRSTRLEN];
#ifdef HAVE_INET_NTOP
inet_ntop(AF_INET, ¬ice.z_sender_addr.s_addr, ipaddr, sizeof(ipaddr));
More information about the Commits
mailing list