pidgin/pidgin

[gaim-migrate @ 16041]

2006-04-16, Tim Ringenbach
6c41d6b54bcb
Parents 1a69e962e3b4
Children 3de3dfcf24fa
[gaim-migrate @ 16041]
Ike Ginerich fixed gaim_markup_slice().
Looks like the way we were using it just happened to work, which explains how
I was sure I tested this and it worked and yet it was broken. Go figure.
2 files changed, 14 insertions(+), 11 deletions(-)
  • +1 -0
    COPYRIGHT
  • +13 -11
    src/util.c
    • --- a/COPYRIGHT Sun Apr 16 15:35:09 2006 +0000
    +++ b/COPYRIGHT Sun Apr 16 18:28:53 2006 +0000
    @@ -104,6 +104,7 @@
    François Gagné
    Evgueni V. Gavrilov
    Ignacy Gawedzki
    +Ike Gingerich
    Gustavo Giráldez
    Richard Gobeille
    Michael Golden
    --- a/src/util.c Sun Apr 16 15:35:09 2006 +0000
    +++ b/src/util.c Sun Apr 16 18:28:53 2006 +0000
    @@ -2121,16 +2121,7 @@
    /* z += 0; */
    }
    - if (z == x && !appended) {
    - GList *l = q->tail;
    -
    - while (l) {
    - tag = l->data;
    - g_string_append(ret, tag);
    - l = l->prev;
    - }
    - appended = TRUE;
    - } else if (z >= x) {
    + if (z >= x) {
    g_string_append_len(ret, str, end - str + 1);
    }
    @@ -2152,6 +2143,17 @@
    z++;
    str = end;
    } else {
    + if (z == x && z > 0 && !appended) {
    + GList *l = q->tail;
    +
    + while (l) {
    + tag = l->data;
    + g_string_append(ret, tag);
    + l = l->prev;
    + }
    + appended = TRUE;
    + }
    +
    if (z >= x)
    g_string_append_unichar(ret, c);
    z++;
    @@ -2184,7 +2186,7 @@
    if (tag[i] == '>' || tag[i] == ' ' || tag[i] == '/')
    break;
    - return g_strndup(tag, i);
    + return g_strndup(tag+1, i-1);
    }
    /**************************************************************************