Mercurial > pidgin
diff src/protocols/yahoo/yahoo.c @ 3493:4b204c262376
[gaim-migrate @ 3553]
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c
----------------------------------------------------------------------
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Tue, 10 Sep 2002 15:31:34 +0000 |
parents | 79e0d2f8ad2b |
children | 8de976fe3ed8 |
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c Sun Sep 08 15:22:48 2002 +0000 +++ b/src/protocols/yahoo/yahoo.c Tue Sep 10 15:31:34 2002 +0000 @@ -591,7 +591,7 @@ msg[j++] = m[i]; } msg[j] = 0; - serv_got_im(gc, from, msg, 0, tm, -1); + serv_got_im(gc, from, utf8_to_str(msg), 0, tm, -1); } else if (pkt->status == 2) { do_error_dialog(_("Your Yahoo! message did not get sent."), NULL, GAIM_ERROR); } @@ -970,6 +970,7 @@ struct gaim_connection *gc = new_gaim_conn(user); struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1); + g_snprintf(gc->username, sizeof(gc->username), "%s", g_strstrip(gc->username)); set_login_progress(gc, 1, "Connecting"); yd->fd = -1; @@ -1178,15 +1179,16 @@ { struct yahoo_data *yd = gc->proto_data; struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, 0); + char *msg = str_to_utf8(what); yahoo_packet_hash(pkt, 1, gc->displayname); yahoo_packet_hash(pkt, 5, who); - yahoo_packet_hash(pkt, 14, what); + yahoo_packet_hash(pkt, 14, msg); yahoo_send_packet(yd, pkt); yahoo_packet_free(pkt); - + return 1; }