diff options
| author | Eunyoung Lee <ey928.lee@samsung.com> | 2015-07-07 11:08:55 +0900 |
|---|---|---|
| committer | Eunyoung Lee <ey928.lee@samsung.com> | 2015-07-07 11:08:55 +0900 |
| commit | 25749970843df4ef45aa2ba3bea62467b93b8c3e (patch) | |
| tree | 98a801d054d20fb1de4fe096db2a9ff0de6d4078 /daemon | |
| parent | 5da149be4b7cf6efb89cf20de965edf96399792c (diff) | |
| download | indicator-win-25749970843df4ef45aa2ba3bea62467b93b8c3e.tar.gz indicator-win-25749970843df4ef45aa2ba3bea62467b93b8c3e.tar.bz2 indicator-win-25749970843df4ef45aa2ba3bea62467b93b8c3e.zip | |
Modify function to add timer
Change-Id: Ic9ae3ff952ac34bd836912d9ffcede3f1d0c017b
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/main.c | 28 | ||||
| -rw-r--r-- | daemon/main.h | 2 |
2 files changed, 10 insertions, 20 deletions
diff --git a/daemon/main.c b/daemon/main.c index 232799a..ed837a7 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -89,7 +89,6 @@ static Eina_Bool home_button_pressed = EINA_FALSE; static Eina_Bool show_hide_pressed = EINA_FALSE; Evas_Coord_Point indicator_press_coord = {0,0}; Ecore_Timer *clock_timer; -static Ecore_Timer *listen_timer = NULL; int is_transparent = 0; int current_angle = 0; int current_state = 0; @@ -608,26 +607,20 @@ static Evas_Object *_create_layout(Evas_Object * parent, const char *file, const return layout; } -static void _indicator_listen_timer_cb(void* data) +static Eina_Bool _indicator_listen_timer_cb(void* data) { - char *indi_name = NULL; win_info *win = NULL; ret_if(!data); win = (win_info*)data; - indi_name = "elm_indicator"; - if (listen_timer != NULL) { - ecore_timer_del(listen_timer); - listen_timer = NULL; - } - - if (!elm_win_socket_listen(win->win , indi_name, 0, EINA_FALSE)) { + if (!elm_win_socket_listen(win->win , INDICATOR_SERVICE_NAME, 0, EINA_FALSE)) { _E("faile to elm_win_socket_listen() %x", win->win); - listen_timer = ecore_timer_add(3, (void *)_indicator_listen_timer_cb, win); + return ECORE_CALLBACK_RENEW; } else { _D("listen success"); + return ECORE_CALLBACK_CANCEL; } } @@ -649,7 +642,6 @@ static void _create_box(win_info *win) #define INDICATOR_HEIGHT_WVGA 36 static void _create_win(void* data) { - char *indi_name = NULL; struct appdata *ad = NULL; Ecore_X_Window xwin; // Ecore_X_Window zone; @@ -686,10 +678,8 @@ static void _create_win(void* data) #endif /* Create socket window */ - ad->win.win = elm_win_add(NULL, "portrait_indicator", ELM_WIN_SOCKET_IMAGE); + ad->win.win = elm_win_add(NULL, "indicator", ELM_WIN_SOCKET_IMAGE); ret_if(!(ad->win.win)); - indi_name = "elm_indicator"; - elm_win_title_set(ad->win.win, "win sock test:port"); /* FIXME : get indicator width and height withour ecore_x API */ elm_win_screen_size_get(ad->win.win, NULL, NULL, &root_w, &root_h); @@ -719,14 +709,12 @@ static void _create_win(void* data) ad->win.w = root_w; _D("=============================== Window w, h (%d, %d)", ad->win.port_w, ad->win.h); - if (!elm_win_socket_listen(ad->win.win , indi_name, 0, EINA_FALSE)) { + if (!elm_win_socket_listen(ad->win.win , INDICATOR_SERVICE_NAME, 0, EINA_FALSE)) { _E("failed 1st to elm_win_socket_listen() %x", ad->win.win); /* Start timer */ - if (listen_timer != NULL) { - ecore_timer_del(listen_timer); - listen_timer = NULL; + if (ecore_timer_add(3, _indicator_listen_timer_cb, &(ad->win))) { + _E("Failed to add timer object"); } - listen_timer = ecore_timer_add(3, (void *)_indicator_listen_timer_cb, &(ad->win)); } #if 0 elm_win_alpha_set(ad->win.win , EINA_TRUE); diff --git a/daemon/main.h b/daemon/main.h index 3998861..d88e211 100644 --- a/daemon/main.h +++ b/daemon/main.h @@ -84,6 +84,8 @@ #define MSG_DOMAIN_CONTROL_ACCESS (int)ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL +#define INDICATOR_SERVICE_NAME "elm_indicator" + enum _win_type { /* Clock view */ TOP_WIN_NORMAL = 0, |