gaim/gaim

Fix encoding of filename
oldstatus
2005-06-06, Daniel Atallah
c4609c3a9416
Parents 65002fb4639c
Children b420ba666185
Fix encoding of filename
1 files changed, 13 insertions(+), 6 deletions(-)
  • +13 -6
    src/protocols/yahoo/yahoo_filexfer.c
    • --- a/src/protocols/yahoo/yahoo_filexfer.c Sun Jun 05 20:49:37 2005 -0400
    +++ b/src/protocols/yahoo/yahoo_filexfer.c Mon Jun 06 18:31:42 2005 -0400
    @@ -92,7 +92,7 @@
    GaimConnection *gc;
    GaimAccount *account;
    struct yahoo_data *yd;
    - char *filename;
    + char *filename, *encoded_filename;
    gaim_debug(GAIM_DEBUG_INFO, "yahoo",
    "AAA - in yahoo_sendfile_connected\n");
    @@ -125,7 +125,8 @@
    yahoo_packet_hash(pkt, 5, xfer->who);
    yahoo_packet_hash(pkt, 14, "");
    filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
    - yahoo_packet_hash(pkt, 27, gaim_url_encode(filename));
    + encoded_filename = yahoo_string_encode(gc, filename, NULL);
    + yahoo_packet_hash(pkt, 27, encoded_filename);
    yahoo_packet_hash(pkt, 28, size);
    content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
    @@ -150,6 +151,7 @@
    g_free(size);
    g_free(post);
    g_free(buf);
    + g_free(encoded_filename);
    g_free(filename);
    }
    @@ -423,18 +425,23 @@
    xfer->data = xfer_data;
    /* Set the info about the incoming file. */
    - if (filename)
    - gaim_xfer_set_filename(xfer, filename);
    - else {
    + if (filename) {
    + char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
    + gaim_xfer_set_filename(xfer, utf8_filename);
    + g_free(utf8_filename);
    + } else {
    gchar *start, *end;
    start = g_strrstr(xfer_data->path, "/");
    if (start)
    start++;
    end = g_strrstr(xfer_data->path, "?");
    if (start && *start && end) {
    + char *utf8_filename;
    filename = g_strndup(start, end - start);
    - gaim_xfer_set_filename(xfer, filename);
    + utf8_filename = yahoo_string_decode(gc, filename, TRUE);
    g_free(filename);
    + gaim_xfer_set_filename(xfer, utf8_filename);
    + g_free(utf8_filename);
    filename = NULL;
    }
    }