rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d05f89463d7be2512cd7bf6e5ccab204e5f70428
commit d05f89463d7be2512cd7bf6e5ccab204e5f70428
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Wed Jan 27 15:21:40 2016 +0000
colorclass_manager: colorclass should be easy to delete, even if it is used
---
src/bin/ui/colorclass_manager.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index fcd8a95..8d6d1a8 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -128,10 +128,6 @@ _on_button_delete_clicked_cb(void *data __UNUSED__,
void *event_info __UNUSED__)
{
Colorclasses_Manager *edit = (Colorclasses_Manager *)data;
- State *state;
- char buf[BUFF_MAX];
- int symbs = 0;
- Eina_List *l;
Resource *res;
assert(edit != NULL);
@@ -143,6 +139,15 @@ _on_button_delete_clicked_cb(void *data __UNUSED__,
Colorclass_Item *ccl = elm_object_item_data_get(it);
res = pm_resource_get(ap.project->colorclasses, ccl->name);
+ edje_edit_color_class_del(ap.project->global_object, ccl->name);
+ ap.project->colorclasses = pm_resource_del(ap.project->colorclasses, res);
+ elm_object_item_del(it);
+
+#if 0
+ State *state;
+ char buf[BUFF_MAX];
+ int symbs = 0;
+ Eina_List *l;
if (!res->used_in)
{
edje_edit_color_class_del(ap.project->global_object, ccl->name);
@@ -163,6 +168,7 @@ _on_button_delete_clicked_cb(void *data __UNUSED__,
WARN("%s", buf);
return;
}
+#endif
if (!next) next = elm_genlist_item_prev_get(it);
if (next)
--
