qulogic/libgnt

Merge release-2.x.y

2014-05-07, Tomasz Wasilczyk
89c1ae510759
Parents 5f023b9c16002fd58955e886
Children 7000ff527de782dab3429b58
Merge release-2.x.y
9 files changed, 14 insertions(+), 8 deletions(-)
  • +2 -2
    gntbox.c
  • +1 -1
    gntcheckbox.c
  • +1 -1
    gntcombobox.c
  • +1 -1
    gntentry.c
  • +1 -1
    gnttextview.c
  • +2 -0
    gntwidget.c
  • +3 -1
    gntwm.c
  • +2 -0
    gntws.c
  • +1 -1
    wms/irssi.c
    • --- a/gntbox.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntbox.c Wed May 07 11:07:45 2014 +0200
    @@ -232,8 +232,8 @@
    h = maxh;
    }
    - gnt_widget_confirm_size(wid, w, h);
    - gnt_widget_set_size(wid, w, h);
    + if (gnt_widget_confirm_size(wid, w, h))
    + gnt_widget_set_size(wid, w, h);
    }
    reposition_children(widget);
    --- a/gntcheckbox.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntcheckbox.c Wed May 07 11:07:45 2014 +0200
    @@ -52,7 +52,7 @@
    wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_NORMAL));
    mvwaddstr(widget->window, 0, 4, C_(GNT_BUTTON(cb)->priv->text));
    - wmove(widget->window, 0, 1);
    + (void)wmove(widget->window, 0, 1);
    GNTDEBUG;
    }
    --- a/gntcombobox.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntcombobox.c Wed May 07 11:07:45 2014 +0200
    @@ -96,7 +96,7 @@
    whline(widget->window, ' ' | gnt_color_pair(type), widget->priv.width - 4 - len);
    mvwaddch(widget->window, 1, widget->priv.width - 3, ACS_VLINE | gnt_color_pair(GNT_COLOR_NORMAL));
    mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | gnt_color_pair(GNT_COLOR_NORMAL));
    - wmove(widget->window, 1, 1);
    + (void)wmove(widget->window, 1, 1);
    g_free(text);
    GNTDEBUG;
    --- a/gntentry.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntentry.c Wed May 07 11:07:45 2014 +0200
    @@ -299,7 +299,7 @@
    curpos = gnt_util_onscreen_width(entry->scroll, entry->cursor);
    if (focus)
    mvwchgat(widget->window, 0, curpos, 1, A_REVERSE, GNT_COLOR_TEXT_NORMAL, NULL);
    - wmove(widget->window, 0, curpos);
    + (void)wmove(widget->window, 0, curpos);
    GNTDEBUG;
    }
    --- a/gnttextview.c Tue May 06 18:27:58 2014 +0200
    +++ b/gnttextview.c Wed May 07 11:07:45 2014 +0200
    @@ -106,7 +106,7 @@
    GList *iter;
    GntTextLine *line = lines->data;
    - wmove(widget->window, widget->priv.height - 1 - i - comp, 0);
    + (void)wmove(widget->window, widget->priv.height - 1 - i - comp, 0);
    for (iter = line->segments; iter; iter = iter->next)
    {
    --- a/gntwidget.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntwidget.c Wed May 07 11:07:45 2014 +0200
    @@ -318,6 +318,8 @@
    void
    gnt_widget_show(GntWidget *widget)
    {
    + g_return_if_fail(widget != NULL);
    +
    gnt_widget_draw(widget);
    gnt_screen_occupy(widget);
    }
    --- a/gntwm.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntwm.c Wed May 07 11:07:45 2014 +0200
    @@ -141,7 +141,7 @@
    int curx = active->priv.x + getcurx(active->window);
    int cury = active->priv.y + getcury(active->window);
    if (wmove(node->window, cury - widget->priv.y, curx - widget->priv.x) != OK)
    - wmove(node->window, 0, 0);
    + (void)wmove(node->window, 0, 0);
    }
    }
    }
    @@ -1817,6 +1817,8 @@
    maxx = getmaxx(stdscr);
    maxy = getmaxy(stdscr) - 1; /* room for the taskbar */
    + maxx = MAX(0, maxx);
    + maxy = MAX(0, maxy);
    x = MAX(0, x);
    y = MAX(0, y);
    --- a/gntws.c Tue May 06 18:27:58 2014 +0200
    +++ b/gntws.c Wed May 07 11:07:45 2014 +0200
    @@ -62,6 +62,8 @@
    if (gnt_is_refugee())
    return;
    + g_return_if_fail(ws != NULL);
    +
    if (taskbar == NULL) {
    taskbar = newwin(1, getmaxx(stdscr), getmaxy(stdscr) - 1, 0);
    } else if (reposition) {
    --- a/wms/irssi.c Tue May 06 18:27:58 2014 +0200
    +++ b/wms/irssi.c Wed May 07 11:07:45 2014 +0200
    @@ -218,7 +218,7 @@
    getyx(node->window, y, x);
    wbkgdset(node->window, '\0' | COLOR_PAIR(gnt_widget_has_focus(node->me) ? GNT_COLOR_TITLE : GNT_COLOR_TITLE_D));
    mvwaddstr(node->window, 0, 0, title);
    - wmove(node->window, y, x);
    + (void)wmove(node->window, y, x);
    if (!gnt_is_refugee()) {
    update_panels();
    doupdate();