changeset
Merged in xhaakon/pidgin (pull request #170)
Fri, 26 May 2017 01:15:56 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 26 May 2017 01:15:56 +0000
- changeset 38276
- b284e24fa3dd
- parent 38247
- 107c6c2342ff (current diff)
- parent 38275
- 4616ae5456f8 (diff)
- child 38299
- 770365ded9f8
Merged in xhaakon/pidgin (pull request #170)
gtkwebviewtoolbar: fix painting of font button background
Approved-by: Gary Kramlich <grim@reaperworld.com>
Approved-by: Jorge Villasenor <salinasv@gmail.com>
Approved-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- 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*
