diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2015-09-15 12:34:56 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2015-09-15 12:38:08 +0100 |
| commit | 091f3e8eee6eed9c2a6fc551cb7273edd93ca451 (patch) | |
| tree | b0582f25efebe288d04f8ebf0386e549e5c75c38 | |
| parent | 0a0ac6a27b8c97bb8acb6860d44290ed92bcfd6a (diff) | |
| download | totem-091f3e8eee6eed9c2a6fc551cb7273edd93ca451.tar.gz | |
Revert "main: Bring back video inside the window under Wayland"
This reverts commit 6051dd76ac5e1738e00cbb677aeadea32e3df3be.
Now that Clutter/Clutter-Gtk work correctly with the GDK backend of Clutter,
we can revert this.
https://bugzilla.gnome.org/show_bug.cgi?id=754937
| -rw-r--r-- | src/totem-object.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 8f540bf52..d04d93bf2 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -68,10 +68,6 @@ #include "totem-mime-types.h" #include "totem-uri-schemes.h" -#ifdef GDK_WINDOWING_WAYLAND -#include <gdk/gdkwayland.h> -#endif /* GDK_WINDOWING_WAYLAND */ - #define REWIND_OR_PREVIOUS 4000 #define SEEK_FORWARD_SHORT_OFFSET 15 @@ -505,22 +501,6 @@ totem_object_init (TotemObject *totem) { GtkSettings *gtk_settings; - gtk_init (NULL, NULL); - -#ifdef GDK_WINDOWING_WAYLAND - /* Work-around lack of sub-surface support in Clutter's - * GDK backend: - * https://bugzilla.gnome.org/show_bug.cgi?id=752143 - * Also remove the include when that's fixed */ - { - GdkDisplay *display; - - display = gdk_display_get_default (); - if (GDK_IS_WAYLAND_DISPLAY (display)) - g_setenv ("CLUTTER_BACKEND", "wayland", TRUE); - } -#endif - if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) g_warning ("gtk-clutter failed to initialise, expect problems from here on."); |