Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+11
-11
+11
-11
scripts/kconfig/gconf.c
+11
-11
scripts/kconfig/gconf.c
···
176
176
const gchar *_mod = "";
177
177
const gchar *_yes = "";
178
178
const gchar *value = "";
179
-
GdkColor color;
179
+
GdkRGBA color;
180
180
gboolean editable = FALSE;
181
181
gboolean btnvis = FALSE;
182
182
···
186
186
menu->type == M_COMMENT ? "***" : "",
187
187
sym && !sym_has_value(sym) ? "(NEW)" : "");
188
188
189
-
gdk_color_parse(menu_is_visible(menu) ? "Black" : "DarkGray", &color);
189
+
gdk_rgba_parse(&color, menu_is_visible(menu) ? "Black" : "DarkGray");
190
190
191
191
if (!sym)
192
192
goto set;
···
1174
1174
G_TYPE_STRING, G_TYPE_STRING,
1175
1175
G_TYPE_STRING, G_TYPE_STRING,
1176
1176
G_TYPE_STRING, G_TYPE_STRING,
1177
-
G_TYPE_POINTER, GDK_TYPE_COLOR,
1177
+
G_TYPE_POINTER, GDK_TYPE_RGBA,
1178
1178
G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
1179
1179
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
1180
1180
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
···
1205
1205
gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
1206
1206
renderer,
1207
1207
"text", COL_OPTION,
1208
-
"foreground-gdk",
1208
+
"foreground-rgba",
1209
1209
COL_COLOR, NULL);
1210
1210
1211
1211
sel = gtk_tree_view_get_selection(view);
···
1225
1225
G_TYPE_STRING, G_TYPE_STRING,
1226
1226
G_TYPE_STRING, G_TYPE_STRING,
1227
1227
G_TYPE_STRING, G_TYPE_STRING,
1228
-
G_TYPE_POINTER, GDK_TYPE_COLOR,
1228
+
G_TYPE_POINTER, GDK_TYPE_RGBA,
1229
1229
G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
1230
1230
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
1231
1231
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
···
1263
1263
gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
1264
1264
renderer,
1265
1265
"text", COL_OPTION,
1266
-
"foreground-gdk",
1266
+
"foreground-rgba",
1267
1267
COL_COLOR, NULL);
1268
1268
1269
1269
renderer = gtk_cell_renderer_text_new();
1270
1270
gtk_tree_view_insert_column_with_attributes(view, -1,
1271
1271
"Name", renderer,
1272
1272
"text", COL_NAME,
1273
-
"foreground-gdk",
1273
+
"foreground-rgba",
1274
1274
COL_COLOR, NULL);
1275
1275
renderer = gtk_cell_renderer_text_new();
1276
1276
gtk_tree_view_insert_column_with_attributes(view, -1,
1277
1277
"N", renderer,
1278
1278
"text", COL_NO,
1279
-
"foreground-gdk",
1279
+
"foreground-rgba",
1280
1280
COL_COLOR, NULL);
1281
1281
renderer = gtk_cell_renderer_text_new();
1282
1282
gtk_tree_view_insert_column_with_attributes(view, -1,
1283
1283
"M", renderer,
1284
1284
"text", COL_MOD,
1285
-
"foreground-gdk",
1285
+
"foreground-rgba",
1286
1286
COL_COLOR, NULL);
1287
1287
renderer = gtk_cell_renderer_text_new();
1288
1288
gtk_tree_view_insert_column_with_attributes(view, -1,
1289
1289
"Y", renderer,
1290
1290
"text", COL_YES,
1291
-
"foreground-gdk",
1291
+
"foreground-rgba",
1292
1292
COL_COLOR, NULL);
1293
1293
renderer = gtk_cell_renderer_text_new();
1294
1294
gtk_tree_view_insert_column_with_attributes(view, -1,
···
1296
1296
"text", COL_VALUE,
1297
1297
"editable",
1298
1298
COL_EDIT,
1299
-
"foreground-gdk",
1299
+
"foreground-rgba",
1300
1300
COL_COLOR, NULL);
1301
1301
g_signal_connect(G_OBJECT(renderer), "edited",
1302
1302
G_CALLBACK(renderer_edited), tree2_w);