qulogic/libgnt

propagate from branch 'im.pidgin.pidgin' (head c8738b0aa75f71f3931a58845675a6a1147788be)
next.minor
2009-10-03, John Bailey
3f51f669f6fb
Parents a59f1126ff6ec8738b0aa75f
Children 0c1214b42880
propagate from branch 'im.pidgin.pidgin' (head c8738b0aa75f71f3931a58845675a6a1147788be)
to branch 'im.pidgin.pidgin.next.minor' (head a59f1126ff6e241783a75e1d6b23dbfeb5047779)
1 files changed, 7 insertions(+), 2 deletions(-)
  • +7 -2
    gntcolors.c
    • --- a/gntcolors.c Wed Sep 16 15:41:33 2009 +0000
    +++ b/gntcolors.c Sat Oct 03 16:29:05 2009 +0000
    @@ -208,8 +208,10 @@
    key = g_ascii_strdown(key, -1);
    color = gnt_colors_get_color(key);
    g_free(key);
    - if (color == -EINVAL)
    + if (color == -EINVAL) {
    + g_strfreev(list);
    continue;
    + }
    init_color(color, r, g, b);
    }
    @@ -251,8 +253,10 @@
    int bg = gnt_colors_get_color(bgc);
    g_free(fgc);
    g_free(bgc);
    - if (fg == -EINVAL || bg == -EINVAL)
    + if (fg == -EINVAL || bg == -EINVAL) {
    + g_strfreev(list);
    continue;
    + }
    key = g_ascii_strdown(key, -1);
    @@ -275,6 +279,7 @@
    else if (strcmp(key, "urgent") == 0)
    type = GNT_COLOR_URGENT;
    else {
    + g_strfreev(list);
    g_free(key);
    continue;
    }