From 89360b26af226c41b3af76b0447f7f2c19cbf6b7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 11 Apr 2020 15:51:47 -0400
Subject: [PATCH] window: Stop dealing with prefer-dark

Its 2020.  If you want maching window decorations, use CSD.
---
 gtk/gtkwindow.c | 55 -------------------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 69e3e7a399..3343809d47 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -462,12 +462,6 @@ static void     get_shadow_width                      (GtkWindow    *window,
 static gboolean    gtk_window_activate_menubar        (GtkWidget    *widget,
                                                        GVariant     *args,
                                                        gpointer      unused);
-#ifdef GDK_WINDOWING_X11
-static void        gtk_window_on_theme_variant_changed (GtkSettings *settings,
-                                                        GParamSpec  *pspec,
-                                                        GtkWindow   *window);
-#endif
-static void        gtk_window_set_theme_variant         (GtkWindow  *window);
 
 static void gtk_window_activate_default_activate (GtkWidget *widget,
                                                   const char *action_name,
@@ -1707,12 +1701,6 @@ gtk_window_init (GtkWindow *window)
   g_object_ref_sink (window);
   priv->has_user_ref_count = TRUE;
 
-#ifdef GDK_WINDOWING_X11
-  g_signal_connect (gtk_settings_get_for_display (priv->display),
-                    "notify::gtk-application-prefer-dark-theme",
-                    G_CALLBACK (gtk_window_on_theme_variant_changed), window);
-#endif
-
   widget_node = gtk_widget_get_css_node (GTK_WIDGET (window));
   priv->decoration_node = gtk_css_node_new ();
   gtk_css_node_set_name (priv->decoration_node, g_quark_from_static_string ("decoration"));
@@ -4055,12 +4043,6 @@ gtk_window_finalize (GObject *object)
                                         device_removed_cb,
                                         window);
 
-#ifdef GDK_WINDOWING_X11
-  g_signal_handlers_disconnect_by_func (gtk_settings_get_for_display (priv->display),
-                                        gtk_window_on_theme_variant_changed,
-                                        window);
-#endif
-
   g_free (priv->startup_id);
 
   if (priv->mnemonics_display_timeout_id)
@@ -4331,8 +4313,6 @@ gtk_window_map (GtkWidget *widget)
   if (priv->minimize_initially)
     gdk_toplevel_minimize (GDK_TOPLEVEL (priv->surface));
 
-  gtk_window_set_theme_variant (window);
-
   /* No longer use the default settings */
   priv->need_default_size = FALSE;
 
@@ -7081,14 +7061,6 @@ gtk_window_set_display (GtkWindow  *window,
   if (priv->transient_parent && gtk_widget_get_display (GTK_WIDGET (priv->transient_parent)) != display)
     gtk_window_set_transient_for (window, NULL);
 
-#ifdef GDK_WINDOWING_X11
-  g_signal_handlers_disconnect_by_func (gtk_settings_get_for_display (priv->display),
-                                        gtk_window_on_theme_variant_changed, window);
-  g_signal_connect (gtk_settings_get_for_display (display),
-                    "notify::gtk-application-prefer-dark-theme",
-                    G_CALLBACK (gtk_window_on_theme_variant_changed), window);
-#endif
-
   gtk_widget_unroot (widget);
   priv->display = display;
 
@@ -7102,33 +7074,6 @@ gtk_window_set_display (GtkWindow  *window,
   check_scale_changed (window);
 }
 
-static void
-gtk_window_set_theme_variant (GtkWindow *window)
-{
-#ifdef GDK_WINDOWING_X11
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-  gboolean   dark_theme_requested;
-
-  g_object_get (gtk_settings_get_for_display (priv->display),
-                "gtk-application-prefer-dark-theme", &dark_theme_requested,
-                NULL);
-
-  if (GDK_IS_X11_SURFACE (priv->surface))
-    gdk_x11_surface_set_theme_variant (priv->surface,
-                                       dark_theme_requested ? "dark" : NULL);
-#endif
-}
-
-#ifdef GDK_WINDOWING_X11
-static void
-gtk_window_on_theme_variant_changed (GtkSettings *settings,
-                                     GParamSpec  *pspec,
-                                     GtkWindow   *window)
-{
-  gtk_window_set_theme_variant (window);
-}
-#endif
-
 /**
  * gtk_window_is_active:
  * @window: a #GtkWindow