qulogic/libgnt

propagate from branch 'im.pidgin.pidgin.next.minor' (head a0690336b24e5b78f2cb9902012f6c59827e12b1)

2009-03-02, Elliott Sales de Andrade
d4638acb3467
Parents a22901a1d0f71d580837b635
Children 43e5c21ef7245cc64b114060
propagate from branch 'im.pidgin.pidgin.next.minor' (head a0690336b24e5b78f2cb9902012f6c59827e12b1)
to branch 'im.pidgin.pidgin' (head 1d580837b635263872a5c102d218083624c867a0)
3 files changed, 6 insertions(+), 4 deletions(-)
  • +2 -2
    gntcolors.c
  • +2 -1
    gntkeys.c
  • +2 -1
    gntwm.c
    • --- a/gntcolors.c Thu Jan 15 22:37:48 2009 +0000
    +++ b/gntcolors.c Mon Mar 02 04:18:40 2009 +0000
    @@ -208,7 +208,7 @@
    key = g_ascii_strdown(key, -1);
    color = gnt_colors_get_color(key);
    g_free(key);
    - if (color == -1)
    + if (color == -EINVAL)
    continue;
    init_color(color, r, g, b);
    @@ -251,7 +251,7 @@
    int bg = gnt_colors_get_color(bgc);
    g_free(fgc);
    g_free(bgc);
    - if (fg == -1 || bg == -1)
    + if (fg == -EINVAL || bg == -EINVAL)
    continue;
    key = g_ascii_strdown(key, -1);
    --- a/gntkeys.c Thu Jan 15 22:37:48 2009 +0000
    +++ b/gntkeys.c Mon Mar 02 04:18:40 2009 +0000
    @@ -163,7 +163,8 @@
    (*(text + 2) >= 'A' && *(text + 2) <= 'D')) {
    /* Apparently this is necessary for urxvt and screen and xterm */
    if (strstr(term, "screen") == term || strcmp(term, "rxvt-unicode") == 0 ||
    - strstr(term, "xterm") == term)
    + strstr(term, "xterm") == term ||
    + strstr(term, "vt100") == term)
    *(text + 1) = 'O';
    } else if (*(unsigned char*)text == 195) {
    if (*(text + 2) == 0 && strstr(term, "xterm") == term) {
    --- a/gntwm.c Thu Jan 15 22:37:48 2009 +0000
    +++ b/gntwm.c Mon Mar 02 04:18:40 2009 +0000
    @@ -353,7 +353,8 @@
    p->y = y;
    g_hash_table_replace(wm->positions, g_strdup(title + 1), p);
    } else {
    - gnt_warning("Invalid number of arguments (%d) for positioning a window.", l);
    + gnt_warning("Invalid number of arguments (%" G_GSIZE_FORMAT
    + ") for positioning a window.", l);
    }
    g_strfreev(coords);
    }