kconfig: gconf: replace GdkColor with GdkRGBA

GdkColor is deprecated with GTK 3.14. [1]

Use GdkRGBA instead.

This fixes warnings such as:

scripts/kconfig/gconf.c: In function ‘set_node’:
scripts/kconfig/gconf.c:138:9: warning: ‘gdk_color_parse’ is deprecated: Use 'gdk_rgba_parse' instead [-Wdeprecated-declarations]
  138 |         gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
      |         ^~~~~~~~~~~~~~~

[1]: https://gitlab.gnome.org/GNOME/gtk/-/blob/3.14.0/gdk/deprecated/gdkcolor.h#L52

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 313250d4fc53d3453bdb342fd30185b6f713c9cd..f4c2b07e0207ee82ca75011f5fe1a28c9a8a9011 100644 (file)
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -176,7 +176,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *menu)
        const gchar *_mod = "";
        const gchar *_yes = "";
        const gchar *value = "";
-       GdkColor color;
+       GdkRGBA color;
        gboolean editable = FALSE;
        gboolean btnvis = FALSE;
 
@@ -186,7 +186,7 @@ static void set_node(GtkTreeStore *tree, GtkTreeIter *node, struct menu *menu)
                                 menu->type == M_COMMENT ? "***" : "",
                                 sym && !sym_has_value(sym) ? "(NEW)" : "");
 
-       gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
+       gdk_rgba_parse(&color, menu_is_visible(menu) ? "Black" : "DarkGray");
 
        if (!sym)
                goto set;
@@ -1174,7 +1174,7 @@ static void init_left_tree(void)
                                   G_TYPE_STRING, G_TYPE_STRING,
                                   G_TYPE_STRING, G_TYPE_STRING,
                                   G_TYPE_STRING, G_TYPE_STRING,
-                                  G_TYPE_POINTER, GDK_TYPE_COLOR,
+                                  G_TYPE_POINTER, GDK_TYPE_RGBA,
                                   G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -1205,7 +1205,7 @@ static void init_left_tree(void)
        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
                                            renderer,
                                            "text", COL_OPTION,
-                                           "foreground-gdk",
+                                           "foreground-rgba",
                                            COL_COLOR, NULL);
 
        sel = gtk_tree_view_get_selection(view);
@@ -1225,7 +1225,7 @@ static void init_right_tree(void)
                                   G_TYPE_STRING, G_TYPE_STRING,
                                   G_TYPE_STRING, G_TYPE_STRING,
                                   G_TYPE_STRING, G_TYPE_STRING,
-                                  G_TYPE_POINTER, GDK_TYPE_COLOR,
+                                  G_TYPE_POINTER, GDK_TYPE_RGBA,
                                   G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -1263,32 +1263,32 @@ static void init_right_tree(void)
        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
                                            renderer,
                                            "text", COL_OPTION,
-                                           "foreground-gdk",
+                                           "foreground-rgba",
                                            COL_COLOR, NULL);
 
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
                                                    "Name", renderer,
                                                    "text", COL_NAME,
-                                                   "foreground-gdk",
+                                                   "foreground-rgba",
                                                    COL_COLOR, NULL);
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
                                                    "N", renderer,
                                                    "text", COL_NO,
-                                                   "foreground-gdk",
+                                                   "foreground-rgba",
                                                    COL_COLOR, NULL);
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
                                                    "M", renderer,
                                                    "text", COL_MOD,
-                                                   "foreground-gdk",
+                                                   "foreground-rgba",
                                                    COL_COLOR, NULL);
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
                                                    "Y", renderer,
                                                    "text", COL_YES,
-                                                   "foreground-gdk",
+                                                   "foreground-rgba",
                                                    COL_COLOR, NULL);
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
@@ -1296,7 +1296,7 @@ static void init_right_tree(void)
                                                    "text", COL_VALUE,
                                                    "editable",
                                                    COL_EDIT,
-                                                   "foreground-gdk",
+                                                   "foreground-rgba",
                                                    COL_COLOR, NULL);
        g_signal_connect(G_OBJECT(renderer), "edited",
                         G_CALLBACK(renderer_edited), tree2_w);