summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiscomfitor <michael.blumenkrantz@gmail.com>2013-10-05 16:23:38 +0100
committerdiscomfitor <michael.blumenkrantz@gmail.com>2013-10-05 16:23:38 +0100
commitf66eceed10bc7101eda31594a06af82777be53da (patch)
tree517f4bcd9965f6e799c53cef184aab7454bd80b1
parent06a5ba211899c7aec148c6f459bfb33d632d9444 (diff)
Revert "ecore/wayland: Add and initialize subcompositor inside Ecore_Wayland."
This reverts commit 7994b62c6be0368a2b4dcd038de5f25556cb6842.
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h1
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index 30545b7343..6f50ba1eb5 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -102,7 +102,6 @@ struct _Ecore_Wl_Display
102 struct wl_display *display; 102 struct wl_display *display;
103 struct wl_registry *registry; 103 struct wl_registry *registry;
104 struct wl_compositor *compositor; 104 struct wl_compositor *compositor;
105 struct wl_subcompositor *subcompositor;
106 struct wl_shell *shell; 105 struct wl_shell *shell;
107 struct wl_shell *desktop_shell; 106 struct wl_shell *desktop_shell;
108 struct wl_shm *shm; 107 struct wl_shm *shm;
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index ee614e0e4b..d2565b8ff1 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -398,8 +398,6 @@ _ecore_wl_shutdown(Eina_Bool close)
398 wl_data_device_manager_destroy(_ecore_wl_disp->wl.data_device_manager); 398 wl_data_device_manager_destroy(_ecore_wl_disp->wl.data_device_manager);
399 if (_ecore_wl_disp->wl.compositor) 399 if (_ecore_wl_disp->wl.compositor)
400 wl_compositor_destroy(_ecore_wl_disp->wl.compositor); 400 wl_compositor_destroy(_ecore_wl_disp->wl.compositor);
401 if (_ecore_wl_disp->wl.subcompositor)
402 wl_subcompositor_destroy(_ecore_wl_disp->wl.subcompositor);
403 if (_ecore_wl_disp->wl.display) 401 if (_ecore_wl_disp->wl.display)
404 { 402 {
405 wl_registry_destroy(_ecore_wl_disp->wl.registry); 403 wl_registry_destroy(_ecore_wl_disp->wl.registry);
@@ -518,11 +516,6 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
518 ewd->wl.compositor = 516 ewd->wl.compositor =
519 wl_registry_bind(registry, id, &wl_compositor_interface, 3); 517 wl_registry_bind(registry, id, &wl_compositor_interface, 3);
520 } 518 }
521 else if (!strcmp(interface, "wl_subcompositor"))
522 {
523 ewd->wl.subcompositor =
524 wl_registry_bind(registry, id, &wl_subcompositor_interface, 1);
525 }
526 else if (!strcmp(interface, "wl_output")) 519 else if (!strcmp(interface, "wl_output"))
527 _ecore_wl_output_add(ewd, id); 520 _ecore_wl_output_add(ewd, id);
528 else if (!strcmp(interface, "wl_seat")) 521 else if (!strcmp(interface, "wl_seat"))