qulogic/libgnt

Remove redundant checks and assignments.

2019-10-02, Elliott Sales de Andrade
d61c212123f5
Parents b95ff1dccec4
Children 9181386790d8
Remove redundant checks and assignments.
  • +2 -2
    gntbox.c
  • +1 -5
    gntentry.c
  • +2 -9
    gnttextview.c
  • +1 -1
    gnttree.c
  • +2 -1
    gntwm.c
  • --- a/gntbox.c Thu Aug 29 22:36:04 2019 +0000
    +++ b/gntbox.c Wed Oct 02 02:02:37 2019 -0400
    @@ -481,7 +481,7 @@
    gnt_widget_get_size(wid, &w, &h);
    - if (wid != last && !child && w > 0 && h > 0 &&
    + if (wid != last && w > 0 && h > 0 &&
    gnt_widget_get_visible(wid) &&
    gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
    child = wid;
    @@ -1021,7 +1021,7 @@
    else if (dir == -1)
    find_prev_focus(priv);
    - if (now && now != priv->active) {
    + if (now != priv->active) {
    gnt_widget_set_focus(now, FALSE);
    gnt_widget_set_focus(priv->active, TRUE);
    }
    --- a/gntentry.c Thu Aug 29 22:36:04 2019 +0000
    +++ b/gntentry.c Wed Oct 02 02:02:37 2019 -0400
    @@ -295,11 +295,7 @@
    priv->ddown = NULL;
    gnt_entry_key_pressed(GNT_WIDGET(entry), match);
    g_free(match);
    - if (priv->ddown) {
    - gnt_widget_destroy(ddown);
    - } else {
    - priv->ddown = ddown;
    - }
    + priv->ddown = ddown;
    }
    gnt_widget_draw(gnt_widget_get_parent(priv->ddown));
    }
    --- a/gnttextview.c Thu Aug 29 22:36:04 2019 +0000
    +++ b/gnttextview.c Wed Oct 02 02:02:37 2019 -0400
    @@ -433,7 +433,7 @@
    }
    g_list_free(list);
    - list = view->list = g_list_first(view->list);
    + list = g_list_first(view->list);
    /* Go back to the line that was in view before resizing started */
    while (pos--) {
    while (((GntTextLine*)list->data)->soft)
    @@ -770,12 +770,9 @@
    continue;
    }
    - for (segs = line->segments; segs; segs = snext) {
    + for (segs = line->segments; line && segs; segs = snext) {
    GntTextSegment *seg = segs->data;
    - if (!line)
    - break;
    -
    snext = segs->next;
    if (seg->start >= tag->end) {
    /* The segment is somewhere after the tag */
    @@ -787,10 +784,6 @@
    /* This segment starts in the middle of the tag */
    if (text == NULL) {
    g_free(seg);
    - if (G_UNLIKELY(line == NULL)) {
    - g_warn_if_reached();
    - break;
    - }
    line->segments = g_list_delete_link(line->segments, segs);
    if (line->segments == NULL) {
    free_text_line(line);
    --- a/gnttree.c Thu Aug 29 22:36:04 2019 +0000
    +++ b/gnttree.c Wed Oct 02 02:02:37 2019 -0400
    @@ -1517,7 +1517,7 @@
    {
    GntTreeRow *r = priv->root;
    row->next = r;
    - if (r) r->prev = row;
    + r->prev = row;
    if (priv->current == priv->root) {
    priv->current = row;
    }
    --- a/gntwm.c Thu Aug 29 22:36:04 2019 +0000
    +++ b/gntwm.c Wed Oct 02 02:02:37 2019 -0400
    @@ -2404,8 +2404,9 @@
    gnt_ws_draw_taskbar(priv->cws, FALSE);
    update_screen(priv);
    } else if (ws && ws != priv->cws && gnt_widget_get_is_urgent(widget)) {
    - if (!act || (act && !g_list_find(act, ws)))
    + if (!act || !g_list_find(act, ws)) {
    act = g_list_prepend(act, ws);
    + }
    update_act_msg();
    }
    }