static E_Input_Panel *g_input_panel = NULL;
static E_Input_Panel_Floating_Info *g_floating_info = NULL;
static Eina_Bool panel_show_need_rerun = EINA_FALSE;
-static Ecore_Timer *g_timer_wait_update = NULL;
+static gint g_timer_wait_update = 0;
static E_Input_Panel_Surface *
_e_input_panel_surface_get(E_Client *ec)
static void _wait_update_timer_del()
{
- if (g_timer_wait_update)
+ if (g_timer_wait_update > 0)
{
LOGI("deleting wait_update timer");
- ecore_timer_del(g_timer_wait_update);
- g_timer_wait_update = NULL;
+ g_source_remove(g_timer_wait_update);
+ g_timer_wait_update = 0;
}
}
-static Eina_Bool
+static gboolean
_wait_update_timer_handler(void *data)
{
LOGE("TIMED OUT while waiting for ready_set");
_e_input_panel_surface_show(NULL);
- g_timer_wait_update = NULL;
+ g_timer_wait_update = 0;
- return ECORE_CALLBACK_CANCEL;
+ return FALSE;
}
static void
{
LOGI("Registering wait_update_timer");
_wait_update_timer_del();
- g_timer_wait_update = ecore_timer_add(WAIT_UPDATE_TIMER_INTERVAL,
- _wait_update_timer_handler, NULL);
+ g_timer_wait_update = g_timeout_add(WAIT_UPDATE_TIMER_INTERVAL * 1000,
+ _wait_update_timer_handler, NULL);
EINA_LIST_FOREACH(g_input_panel->surfaces, l, ips)
{