[totem] Revert "main: Bring back video inside the window under Wayland"
- From: Lionel Landwerlin <llandwerlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Revert "main: Bring back video inside the window under Wayland"
- Date: Tue, 15 Sep 2015 11:41:36 +0000 (UTC)
commit 091f3e8eee6eed9c2a6fc551cb7273edd93ca451
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Tue Sep 15 12:34:56 2015 +0100
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
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 8f540bf..d04d93b 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.");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]