summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Aguirre <aguirre.nicolas@gmail.com>2015-08-03 14:34:59 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-08-03 14:34:59 +0200
commitd54ef1d5932ac3a886ffc31ca907c6bc846197a0 (patch)
treeebde16fa0b29cc6fc910d0b160e0046ade5fd70c
parent2415d8d352340cc6b2edd60499aa9014b1582e1b (diff)
Revert "[HACK] ecore_evas_fb: Comments ecore_fb_ts calls that aren't resolved at runtime"
This reverts commit ff5f8a0412d02e245754e4a90122a7715036cb64.
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 1f0e3f2692..8042d0c082 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -262,9 +262,9 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
262 262
263 if ((!mouse_handled) || (always_ts)) 263 if ((!mouse_handled) || (always_ts))
264 { 264 {
265 if (1) //ecore_fb_ts_init()) 265 if (ecore_fb_ts_init())
266 { 266 {
267 // ecore_fb_ts_event_window_set(ee); 267 ecore_fb_ts_event_window_set(ee);
268 ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _ecore_evas_event_mouse_button_down, NULL); 268 ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _ecore_evas_event_mouse_button_down, NULL);
269 ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _ecore_evas_event_mouse_button_up, NULL); 269 ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _ecore_evas_event_mouse_button_up, NULL);
270 ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _ecore_evas_event_mouse_move, NULL); 270 ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _ecore_evas_event_mouse_move, NULL);
@@ -287,7 +287,7 @@ _ecore_evas_fb_shutdown(void)
287 if (ecore_evas_event_handlers[i]) 287 if (ecore_evas_event_handlers[i])
288 ecore_event_handler_del(ecore_evas_event_handlers[i]); 288 ecore_event_handler_del(ecore_evas_event_handlers[i]);
289 } 289 }
290 // ecore_fb_ts_shutdown(); 290 ecore_fb_ts_shutdown();
291 ecore_event_evas_shutdown(); 291 ecore_event_evas_shutdown();
292 } 292 }
293 if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0; 293 if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;