diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index 7755365..5d3713a 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -8,47 +8,47 @@ static void _ephoto_delete_main_window(void *data, Evas_Object *obj, void *event static void _ephoto_flow_browser_delete_cb(void *data, Evas_Object *obj, void *event_info); static void _ephoto_thumb_browser_selected_cb(void *data, Evas_Object *obj, void *event_info); static void _ephoto_thumb_browser_directory_changed_cb(void *data, Evas_Object *obj, void *event_info); + /* Objects Callbacks */ static void _ephoto_flow_browser_delete_cb(void *data, Evas_Object *obj, void *event_info) { - em->thumb_browser = ephoto_create_thumb_browser(em->layout, em->cur_directory); - elm_layout_content_set(em->layout, "ephoto.content.swallow", em->thumb_browser); - evas_object_smart_callback_add(em->thumb_browser, - "selected", - _ephoto_thumb_browser_selected_cb, - NULL); - evas_object_smart_callback_add(em->thumb_browser, - "directory,changed", - _ephoto_thumb_browser_directory_changed_cb, - NULL); - - em->state = EPHOTO_STATE_THUMB; + em->thumb_browser = ephoto_create_thumb_browser(em->layout, em->cur_directory); + elm_layout_content_set(em->layout, "ephoto.content.swallow", em->thumb_browser); + evas_object_smart_callback_add(em->thumb_browser, + "selected", + _ephoto_thumb_browser_selected_cb, + NULL); + evas_object_smart_callback_add(em->thumb_browser, + "directory,changed", + _ephoto_thumb_browser_directory_changed_cb, + NULL); + + em->state = EPHOTO_STATE_THUMB; } static void _ephoto_thumb_browser_selected_cb(void *data, Evas_Object *obj, void *event_info) { - const char *file = event_info; + const char *file = event_info; - em->flow_browser = ephoto_create_flow_browser(em->layout); - ephoto_flow_browser_image_set(em->flow_browser, file); - elm_layout_content_set(em->layout, "ephoto.content.swallow", em->flow_browser); - evas_object_smart_callback_add(em->flow_browser, - "delete,request", - _ephoto_flow_browser_delete_cb, - NULL); - em->state = EPHOTO_STATE_FLOW; + em->flow_browser = ephoto_create_flow_browser(em->layout); + ephoto_flow_browser_image_set(em->flow_browser, file); + elm_layout_content_set(em->layout, "ephoto.content.swallow", em->flow_browser); + evas_object_smart_callback_add(em->flow_browser, + "delete,request", + _ephoto_flow_browser_delete_cb, + NULL); + em->state = EPHOTO_STATE_FLOW; } static void _ephoto_thumb_browser_directory_changed_cb(void *data, Evas_Object *obj, void *event_info) { - const char *dir = event_info; + const char *dir = event_info; - eina_stringshare_del(em->cur_directory); - em->cur_directory = eina_stringshare_add(dir); - printf("Directory changed : %s\n", em->cur_directory); + eina_stringshare_del(em->cur_directory); + em->cur_directory = eina_stringshare_add(dir); } /*Create the main ephoto window*/ diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 5d5cc2c..4cee689 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -455,7 +455,7 @@ _ephoto_directory_chosen(void *data, Evas_Object *obj, void *event_info) elm_win_title_set(em->win, "Ephoto"); } } - printf("before callback\n"); + evas_object_smart_callback_call(tb->layout, "directory,changed", tb->current_directory); evas_object_del(tb->fsel_win);