pidgin/pidgin

Merged in xhaakon/pidgin (pull request #170)

2017-05-26, Gary Kramlich
b284e24fa3dd
Parents 107c6c2342ff4616ae5456f8
Children 770365ded9f8
Merged in xhaakon/pidgin (pull request #170)

gtkwebviewtoolbar: fix painting of font button background

Approved-by: Gary Kramlich
Approved-by: Jorge Villasenor
Approved-by: Elliott Sales de Andrade
1 files changed, 7 insertions(+), 2 deletions(-)
  • +7 -2
    pidgin/gtkwebviewtoolbar.c
    • --- a/pidgin/gtkwebviewtoolbar.c Wed Mar 22 23:35:01 2017 -0700
    +++ b/pidgin/gtkwebviewtoolbar.c Fri May 26 01:15:56 2017 +0000
    @@ -134,9 +134,14 @@
    if (strcmp(str, "inherit") == 0) {
    return FALSE;
    - } else {
    - return gdk_rgba_parse(color, str);
    }
    +
    + if (!gdk_rgba_parse(color, str)) {
    + return FALSE;
    + }
    +
    + /* FALSE for fully transparent color (same behavior as with "inherit") */
    + return color->alpha > 0;
    }
    static gchar*