Revert "ecore/wayland: Add and initialize subcompositor inside Ecore_Wayland."
authordiscomfitor <michael.blumenkrantz@gmail.com>
Sat, 5 Oct 2013 15:23:38 +0000 (16:23 +0100)
committerdiscomfitor <michael.blumenkrantz@gmail.com>
Sat, 5 Oct 2013 15:23:38 +0000 (16:23 +0100)
This reverts commit 7994b62c6be0368a2b4dcd038de5f25556cb6842.

src/lib/ecore_wayland/Ecore_Wayland.h
src/lib/ecore_wayland/ecore_wl.c

index 30545b7..6f50ba1 100644 (file)
@@ -102,7 +102,6 @@ struct _Ecore_Wl_Display
         struct wl_display *display;
         struct wl_registry *registry;
         struct wl_compositor *compositor;
-        struct wl_subcompositor *subcompositor;
         struct wl_shell *shell;
         struct wl_shell *desktop_shell;
         struct wl_shm *shm;
index ee614e0..d2565b8 100644 (file)
@@ -398,8 +398,6 @@ _ecore_wl_shutdown(Eina_Bool close)
           wl_data_device_manager_destroy(_ecore_wl_disp->wl.data_device_manager);
         if (_ecore_wl_disp->wl.compositor)
           wl_compositor_destroy(_ecore_wl_disp->wl.compositor);
-        if (_ecore_wl_disp->wl.subcompositor)
-          wl_subcompositor_destroy(_ecore_wl_disp->wl.subcompositor);
         if (_ecore_wl_disp->wl.display)
           {
              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
         ewd->wl.compositor =
           wl_registry_bind(registry, id, &wl_compositor_interface, 3);
      }
-   else if (!strcmp(interface, "wl_subcompositor"))
-     {
-        ewd->wl.subcompositor =
-           wl_registry_bind(registry, id, &wl_subcompositor_interface, 1);
-     }
    else if (!strcmp(interface, "wl_output"))
      _ecore_wl_output_add(ewd, id);
    else if (!strcmp(interface, "wl_seat"))