diff options
author | Rafael Antognolli <rafael.antognolli@intel.com> | 2013-11-01 14:19:11 -0200 |
---|---|---|
committer | Rafael Antognolli <rafael.antognolli@intel.com> | 2013-11-01 15:07:53 -0200 |
commit | 839a737a626d6840c37ce166cc8834b765595bc1 (patch) | |
tree | 45c863660bc9ae68e4f4e5f9bd988e929b60749a /src/lib/ecore_wayland | |
parent | 1c33a1a57b964d9080909c3e9e93f109d11c674f (diff) |
ecore(_evas)/wayland: Move frame callback to engine data.
It's something specific to the ecore_evas engine/module, so there's no
need to keep this info in the Ecore_Wl_Window.
Diffstat (limited to 'src/lib/ecore_wayland')
-rw-r--r-- | src/lib/ecore_wayland/Ecore_Wayland.h | 2 | ||||
-rw-r--r-- | src/lib/ecore_wayland/ecore_wl_window.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h index 387c9f2cde..d42bae7d47 100644 --- a/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/src/lib/ecore_wayland/Ecore_Wayland.h | |||
@@ -157,8 +157,6 @@ struct _Ecore_Wl_Window | |||
157 | Ecore_Wl_Input *keyboard_device; | 157 | Ecore_Wl_Input *keyboard_device; |
158 | 158 | ||
159 | /* FIXME: Shouldn't these attributes be private to the Ecore_Wl_Window? */ | 159 | /* FIXME: Shouldn't these attributes be private to the Ecore_Wl_Window? */ |
160 | Eina_Bool frame_pending : 1; | ||
161 | struct wl_callback *frame_callback; | ||
162 | 160 | ||
163 | Eina_Bool anim_pending : 1; | 161 | Eina_Bool anim_pending : 1; |
164 | struct wl_callback *anim_callback; | 162 | struct wl_callback *anim_callback; |
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 8059f44cbc..97508e28f1 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c | |||
@@ -112,8 +112,6 @@ ecore_wl_window_free(Ecore_Wl_Window *win) | |||
112 | input->keyboard_focus = NULL; | 112 | input->keyboard_focus = NULL; |
113 | } | 113 | } |
114 | 114 | ||
115 | if (win->frame_callback) wl_callback_destroy(win->frame_callback); | ||
116 | win->frame_callback = NULL; | ||
117 | if (win->anim_callback) wl_callback_destroy(win->anim_callback); | 115 | if (win->anim_callback) wl_callback_destroy(win->anim_callback); |
118 | win->anim_callback = NULL; | 116 | win->anim_callback = NULL; |
119 | 117 | ||