emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 0fff900: Work around deprecation of gtk_style_con


From: Philipp Stephani
Subject: [Emacs-diffs] emacs-26 0fff900: Work around deprecation of gtk_style_context_get_background_color
Date: Tue, 3 Oct 2017 09:01:40 -0400 (EDT)

branch: emacs-26
commit 0fff900c18c3ae497294f26fd42b70990638d3ed
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    Work around deprecation of gtk_style_context_get_background_color
    
    * src/gtkutil.c (xg_check_special_colors): Replace call to
    gtk_style_context_get_background_color with its definition.
---
 src/gtkutil.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index a07ee4b..c7d8f92 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -577,11 +577,18 @@ xg_check_special_colors (struct frame *f,
     if (get_fg)
       gtk_style_context_get_color (gsty, state, &col);
     else
-      /* FIXME: gtk_style_context_get_background_color is deprecated
-         in GTK+ 3.16.  New versions of GTK+ don’t use the concept of
-         a single background color any more, so we shouldn’t query for
-         it.  */
-      gtk_style_context_get_background_color (gsty, state, &col);
+      {
+        GdkRGBA *c;
+        /* FIXME: Retrieving the background color is deprecated in
+           GTK+ 3.16.  New versions of GTK+ don’t use the concept of a
+           single background color any more, so we shouldn’t query for
+           it.  */
+        gtk_style_context_get (gsty, state,
+                               GTK_STYLE_PROPERTY_BACKGROUND_COLOR, &c,
+                               NULL);
+        col = *c;
+        gdk_rgba_free (c);
+      }
 
     unsigned short
       r = col.red * 65535,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]