summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-05-29 17:45:32 +0300
committerYakov Goldberg <yakov.g@samsung.com>2014-05-29 17:45:46 +0300
commit440f294c85469947f978ffaa7a748beb2dce34f0 (patch)
tree939eb804770db446de8ddb67f243f17a51005e07
parentee3e037e627be6c63ad9fec17cbb03cb29d8cd70 (diff)
fix generation of json for items with callbacks
-rw-r--r--src/bin/egui_gui/itemview.c1
-rw-r--r--src/lib/generator.c11
2 files changed, 11 insertions, 1 deletions
diff --git a/src/bin/egui_gui/itemview.c b/src/bin/egui_gui/itemview.c
index 37588d4..b2c0dc9 100644
--- a/src/bin/egui_gui/itemview.c
+++ b/src/bin/egui_gui/itemview.c
@@ -76,6 +76,7 @@ _item_list_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
76 } 76 }
77 o = props_hoversel_seqs_add(box, elm_widget_top_get(box), wdg_context_get(wdg), cb_name, EINA_TRUE); 77 o = props_hoversel_seqs_add(box, elm_widget_top_get(box), wdg_context_get(wdg), cb_name, EINA_TRUE);
78 const char *cb_type_name = db_op_desc_nth_par_type_name_get(it_data->op_desc, i); 78 const char *cb_type_name = db_op_desc_nth_par_type_name_get(it_data->op_desc, i);
79 /* Adding user defined Evas_Smart_Cb s from resources. */
79 if (!strcmp(cb_type_name, "Evas_Smart_Cb")) 80 if (!strcmp(cb_type_name, "Evas_Smart_Cb"))
80 { 81 {
81 /* Add callbacks from resources. */ 82 /* Add callbacks from resources. */
diff --git a/src/lib/generator.c b/src/lib/generator.c
index ef91faf..dcc6314 100644
--- a/src/lib/generator.c
+++ b/src/lib/generator.c
@@ -980,7 +980,16 @@ _gui_value_json_get(const Gui_Context *ctx, Gui_Value *gui_value)
980 { 980 {
981 const Gui_Resource *res = gui_context_resource_get(ctx, res_type, dep_id); 981 const Gui_Resource *res = gui_context_resource_get(ctx, res_type, dep_id);
982 if (!res) continue; 982 if (!res) continue;
983 jsncur = eina_json_string_new(resource_value_get(res)); 983 const char *str;
984 if (res_type == RESOURCE_SEQUENCE)
985 {
986 str = resource_name_get(res);
987 }
988 else
989 {
990 str = resource_value_get(res);
991 }
992 jsncur = eina_json_string_new(str);
984 break; 993 break;
985 } 994 }
986 } 995 }