Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/si.c @ 27937:1337d2813b2d
propagate from branch 'im.pidgin.pidgin' (head 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2)
to branch 'im.pidgin.pidgin.yaz' (head 7a5d48783707dd377fd754961d3b009c3e492827)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 07 Apr 2009 14:32:50 +0000 |
| parents | 4dc4d0aa25f5 1688f7e15530 |
| children | 13c774d59ac8 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/si.c Tue Apr 07 05:28:58 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Tue Apr 07 14:32:50 2009 +0000 @@ -38,6 +38,8 @@ #define STREAMHOST_CONNECT_TIMEOUT 15 +#include "util.h" + typedef struct _JabberSIXfer { JabberStream *js; @@ -1238,8 +1240,17 @@ JabberIq *iq; xmlnode *si, *file, *feature, *x, *field, *option, *value; char buf[32]; + gchar *f1 = NULL, *f2 = NULL; + gsize dummy; - xfer->filename = g_path_get_basename(xfer->local_filename); + /* yaz */ + f1 = g_filename_display_basename(xfer->local_filename); + f2 = botch_utf(f1, strlen(f1), &dummy); + if(f2){ + purple_xfer_set_filename(xfer, (char *)f2); + } + g_free(f1); f1 = NULL; + g_free(f2); f2 = NULL; iq = jabber_iq_new(jsx->js, JABBER_IQ_SET); xmlnode_set_attrib(iq->node, "to", xfer->who);