From 15060a8f24bdce8fe2dac911059ca996f60c3456 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 4 Feb 2014 11:39:48 -0500 Subject: [PATCH] Revert "gdk: enable rgba visuals by default" This reverts commit a2ccb6601e0fb6dbe55517ad399728a00f6d7e40. This turns out to break GtkStatusIcon, and invalidates the documentation of gdk_screen_get_system_visual(). --- docs/reference/gtk/running.sgml | 9 --------- gdk/x11/gdkvisual-x11.c | 8 -------- 2 files changed, 17 deletions(-) diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml index c7d2d9bc9a..8065e194e8 100644 --- a/docs/reference/gtk/running.sgml +++ b/docs/reference/gtk/running.sgml @@ -478,15 +478,6 @@ nevertheless. - - <envar>GDK_RGBA</envar> - - - Since 3.12, this environment variable can be used to prevent - using RGBA visuals on the X11 backend by setting GDK_RGBA=0. - - - <envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar> diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 0c401f2814..0898a9f6b9 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -285,14 +285,6 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) } } - /* prefer the RGBA visual unless GDK_RGBA=0 */ - if (x11_screen->rgba_visual) - { - const gchar *csd_env = g_getenv ("GDK_RGBA"); - if (g_strcmp0 (csd_env, "0") != 0) - x11_screen->system_visual = x11_screen->rgba_visual; - } - #ifdef G_ENABLE_DEBUG if (_gdk_debug_flags & GDK_DEBUG_MISC) {