yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=9b7be14ebe6743668f5babfd1631459f2f63859a
commit 9b7be14ebe6743668f5babfd1631459f2f63859a
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Mar 24 13:26:17 2015 +0200
Clean up: remove unused code.
---
src/bin/egui_gui/editor.c | 7 +++++--
src/lib/database.c | 12 ------------
src/lib/database.h | 3 +--
src/lib/ffi_glue.c | 9 ---------
src/lib/ffi_glue.h | 4 ----
5 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 61eb42e..c501ba6 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -3998,7 +3998,6 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_De
{
const char *entry_data;
eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
- Gui_Session *session = (Gui_Session *)
gui_context_editor_session_get(ctx);
/* Run CONTENT_PACK for table in order to reset with new coordinates.
*/
if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS))
@@ -4019,7 +4018,11 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_De
ci = obj_container_item_new(new_prop, eid);
wdg_obj_container_item_add((Gui_Widget *) wdg, ci,
pfd->it_data->idx);
- manager_widget_content_reset(session, wdg, new_prop, MODE_EDITOR,
NULL);
+
+ _wdg_parent_win_reload(wdg);
+ _editor_wdg_selected_set(wdg);
+ objtree_build(ctx);
+ objtree_item_selected_set(wdg);
}
if (!strcmp(container_class_name, DB_DEF_CONTAINER_CLASS))
diff --git a/src/lib/database.c b/src/lib/database.c
index 0e246fa..e8b7b46 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -47,7 +47,6 @@ struct _Op_Desc
struct _Container_Desc
{
Op_Desc *_op_pack;
- Op_Desc *_op_repack;
Op_Desc *_op_unpack;
Op_Desc *_op_unpack_all;
};
@@ -672,7 +671,6 @@ _op_settings_init(const char *db_path)
eina_hash_add(container_typedef_table, "CONTAINER_PACK", (void *)
(uintptr_t) CONTAINER_PACK);
eina_hash_add(container_typedef_table, "CONTAINER_UNPACK", (void *)
(uintptr_t) CONTAINER_UNPACK);
eina_hash_add(container_typedef_table, "CONTAINER_UNPACK_ALL", (void *)
(uintptr_t) CONTAINER_UNPACK_ALL);
- eina_hash_add(container_typedef_table, "CONTAINER_REPACK", (void *)
(uintptr_t) CONTAINER_REPACK);
/* Get JSON object from DB by path. */
jv = _db_json_object_get(db_path);
@@ -1142,11 +1140,6 @@ db_init(const char *db_path, const char *all_eo_path,
const char *black_list)
container_desc->_op_pack = op_desc;
break;
}
- case CONTAINER_REPACK:
- {
- container_desc->_op_repack = op_desc;
- break;
- }
case CONTAINER_UNPACK:
{
container_desc->_op_unpack = op_desc;
@@ -1633,11 +1626,6 @@ db_container_desc_op_desc_get(const Container_Desc
*container_desc, Container_Be
ret = container_desc->_op_pack;
break;
}
- case CONTAINER_REPACK:
- {
- ret = container_desc->_op_repack;
- break;
- }
case CONTAINER_UNPACK:
{
ret = container_desc->_op_unpack;
diff --git a/src/lib/database.h b/src/lib/database.h
index 16e61e8..337bbef 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -23,8 +23,7 @@ typedef enum
CONTAINER_NONE,
CONTAINER_PACK,
CONTAINER_UNPACK,
- CONTAINER_UNPACK_ALL,
- CONTAINER_REPACK,
+ CONTAINER_UNPACK_ALL
} Container_Behavior_Type;
/* Add all int types before GUI_TYPE_OBJECT, because of typechecking*/
diff --git a/src/lib/ffi_glue.c b/src/lib/ffi_glue.c
index 5ee215c..a1163af 100644
--- a/src/lib/ffi_glue.c
+++ b/src/lib/ffi_glue.c
@@ -182,15 +182,6 @@ manager_widget_content_unset(Gui_Session *session, const
Gui_Widget *wdg, const
return ret;
}
-/* Use to update packing of already packed object. Without unpacking it. */
-Eina_Bool
-manager_widget_content_reset(Gui_Session *session, const Gui_Widget
*container, const Gui_Widget_Property *prop, Action_Mode mode EINA_UNUSED, void
*data EINA_UNUSED)
-{
- const Op_Desc *op_desc =
db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(container)),
CONTAINER_REPACK);
- Eina_Bool ret = _ffi_eo_do_content(session, container, prop, op_desc, NULL);
- return ret;
-}
-
/* this actually "soft" unset. It unpacks only Eo objects, and doesn't affect
internal widget dependancies. */
Eina_Bool
manager_widget_content_unset_all(Gui_Session *session, const Gui_Widget *wdg,
const char *container_name, Action_Mode mode EINA_UNUSED, void *data
EINA_UNUSED)
diff --git a/src/lib/ffi_glue.h b/src/lib/ffi_glue.h
index 17a501d..ea3c11d 100644
--- a/src/lib/ffi_glue.h
+++ b/src/lib/ffi_glue.h
@@ -54,10 +54,6 @@ manager_widget_callback_add(Gui_Session *session, const
Gui_Widget *wdg, const G
Eina_Bool
manager_widget_content_unset(Gui_Session *session, const Gui_Widget *wdg,
const char *container_name, const Gui_Widget_Property *prop, Action_Mode mode
EINA_UNUSED, void *data EINA_UNUSED);
-/* Use to update packing of already packed object. Without unpacking it. */
-Eina_Bool
-manager_widget_content_reset(Gui_Session *session, const Gui_Widget
*container, const Gui_Widget_Property *prop, Action_Mode mode EINA_UNUSED, void
*data EINA_UNUSED);
-
/* this actually "soft" unset. It unpacks only Eo objects, and doesn't affect
internal widget dependencies. */
Eina_Bool
manager_widget_content_unset_all(Gui_Session *session, const Gui_Widget *wdg,
const char *container_name, Action_Mode mode EINA_UNUSED, void *data
EINA_UNUSED);
--
