diff --git a/src/lib/client.c b/src/lib/client.c index 37bc686..f3c3fca 100644 --- a/src/lib/client.c +++ b/src/lib/client.c @@ -215,14 +215,8 @@ Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Ipc_Event_Server_Data *ev) { static Eina_Bool got_tree = EINA_FALSE; - - printf("Received %i bytes from server:\n" - ">>>>>\n" - "%%.%is\n" - ">>>>>\n", - ev->size, ev->size); - Variant_st *v = packet_info_get(ev->data, ev->size); + if (v) { switch(packet_mapping_type_get(v->t.type)) @@ -441,21 +435,6 @@ _gl_selected(void *data __UNUSED__, Evas_Object *pobj __UNUSED__, clouseau_obj_information_list_populate(treeit); } -void -_item_tree_print_string(Tree_Item *parent) -{ - Tree_Item *treeit; - Eina_List *l; - - EINA_LIST_FOREACH(parent->children, l, treeit) - { - _item_tree_print_string(treeit); - } - - if (parent->name) - printf("From EET: <%s>\n", parent->name); -} - static int _load_list(gui_elements *gui) { @@ -647,7 +626,6 @@ elm_main(int argc, char **argv) data_descriptors_shutdown(); free(gui); - printf("Client cleanup.\n"); return 0; } ELM_MAIN() diff --git a/src/lib/helper.c b/src/lib/helper.c index b6149e0..e1b781f 100644 --- a/src/lib/helper.c +++ b/src/lib/helper.c @@ -29,16 +29,17 @@ item_tree_free(Eina_List *tree) void _item_tree_item_string(Tree_Item *parent) -{ +{ /* Use this function if you want to print tree for debug */ Tree_Item *treeit; Eina_List *l; - printf("<%s>\n", parent->name); - EINA_LIST_FOREACH(parent->children, l, treeit) { _item_tree_item_string(treeit); } + + if (parent->name) + printf("<%s>\n", parent->name); } static eet_message_type_mapping eet_mapping[] = { @@ -269,13 +270,6 @@ data_descriptors_init(void) desc->app_closed = app_closed_desc_make(); desc->highlight = highlight_desc_make(); -/* Moved to tree_data_desc_make - EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, st_tree_list); - desc->list = eet_data_descriptor_file_new(&eddc); - - EET_DATA_DESCRIPTOR_ADD_LIST(desc->list, - st_tree_list, "list", list, desc->tree); -*/ /* for variant */ EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Variant_st); desc->_variant_descriptor = eet_data_descriptor_file_new(&eddc); @@ -306,11 +300,6 @@ data_descriptors_init(void) EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor, HIGHLIGHT_STR, desc->highlight); -/* - EET_DATA_DESCRIPTOR_ADD_MAPPING(desc->_variant_unified_descriptor, - APP_TREE_DATA_STR, desc->list); -*/ - EET_DATA_DESCRIPTOR_ADD_VARIANT(desc->_variant_descriptor, Variant_st, "data", data, t, desc->_variant_unified_descriptor); @@ -347,7 +336,7 @@ packet_compose(message_type t, void *data, int data_size, int *size) void *p = eet_data_descriptor_encode(d->_variant_descriptor , v, size); variant_free(v); - printf("%s size=<%d>\n", __func__, *size); +/* printf("%s size=<%d>\n", __func__, *size); */ return p; /* User has to free(p) */ } diff --git a/src/lib/helper.h b/src/lib/helper.h index fac1da1..86d2b05 100644 --- a/src/lib/helper.h +++ b/src/lib/helper.h @@ -119,7 +119,7 @@ Eet_Data_Descriptor *app_closed_desc_make(void); Eet_Data_Descriptor *highlight_desc_make(void); Eet_Data_Descriptor *tree_item_desc_make(void); -Obj_Information * obj_information_get(Tree_Item *treeit); +Obj_Information *obj_information_get(Tree_Item *treeit); void obj_information_free(Obj_Information *oinfo); void item_tree_item_free(Tree_Item *parent); void item_tree_free(Eina_List *tree); diff --git a/src/lib/libclouseau.c b/src/lib/libclouseau.c index 602a305..66598fb 100644 --- a/src/lib/libclouseau.c +++ b/src/lib/libclouseau.c @@ -130,13 +130,8 @@ _del(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Ipc_Event_Server_Del *e Eina_Bool _data(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Ipc_Event_Server_Data *ev) { - printf("Received %i bytes from server:\n" - ">>>>>\n" - "%%.%is\n" - ">>>>>\n", - ev->size, ev->size); - Variant_st *v = packet_info_get(ev->data, ev->size); + switch(packet_mapping_type_get(v->t.type)) { case DATA_REQ: