[gnome-chess] Revert "Disallow 3D mode when running outside of X11"



commit 33cbb7c68f9a873a9e51953975f654057c3d7586
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Feb 22 11:58:56 2014 -0600

    Revert "Disallow 3D mode when running outside of X11"
    
    This reverts commit e71e650adb2b47bf64eddf5caae736adc77282af.
    
    The check is_running_in_x11 is, unfortunately, bogus.

 src/gnome-chess.vala |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/src/gnome-chess.vala b/src/gnome-chess.vala
index b4d16d8..2a15d76 100644
--- a/src/gnome-chess.vala
+++ b/src/gnome-chess.vala
@@ -368,8 +368,7 @@ public class Application : Gtk.Application
                 view_container.remove (view);
                 view.destroy ();
             }
-            // TODO make 3D mode work in Wayland and Mir
-            if (settings.get_boolean ("show-3d") && is_running_in_x11 ())
+            if (settings.get_boolean ("show-3d"))
                 view = new ChessView3D ();
             else
                 view = new ChessView2D ();
@@ -1587,14 +1586,6 @@ public class Application : Gtk.Application
             difficulty_combo.sensitive = false;
         }
 
-        if (!is_running_in_x11 ())
-        {
-            // FIXME leaves ugly blank space
-            // TODO make 3D mode work in Wayland and Mir
-            show_3d_check.hide ();
-            show_3d_smooth_check.hide ();
-        }
-
         preferences_dialog.present ();
     }
 
@@ -2139,14 +2130,6 @@ public class Application : Gtk.Application
         start_game ();
     }
 
-    private bool is_running_in_x11 ()
-    {
-        // FIXME surely there's a better way to test this
-        // TODO make 3D mode work in Wayland and Mir
-        var temp_view = new ChessView2D ();
-        return (temp_view.get_window () as Gdk.X11.Window) != null;
-    }
-
     private void enable_window_action (string name)
     {
         ((SimpleAction) window.lookup_action (name)).set_enabled (true);


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