qulogic/libgnt

propagate from branch 'im.pidgin.pidgin' (head 278dd7b1366b695274223f1a2bef05fb837ad3ad)
to branch 'im.pidgin.pidgin.next.major' (head dd4d806aab54ae5577b1a4c014912ea17ba60fd9)
  • +2 -2
    gntcolors.c
  • --- a/gntcolors.c Sun Mar 13 23:11:32 2011 +0000
    +++ b/gntcolors.c Mon May 09 04:26:46 2011 +0000
    @@ -161,9 +161,9 @@
    color = custom ? GNT_COLOR_BLUE : COLOR_BLUE;
    else if (strcmp(key, "white") == 0)
    color = custom ? GNT_COLOR_WHITE : COLOR_WHITE;
    - else if (strcmp(key, "gray") == 0)
    + else if (strcmp(key, "gray") == 0 || strcmp(key, "grey") == 0)
    color = custom ? GNT_COLOR_GRAY : COLOR_YELLOW; /* eh? */
    - else if (strcmp(key, "darkgray") == 0)
    + else if (strcmp(key, "darkgray") == 0 || strcmp(key, "darkgrey") == 0)
    color = custom ? GNT_COLOR_DARK_GRAY : COLOR_BLACK;
    else if (strcmp(key, "magenta") == 0)
    color = COLOR_MAGENTA;