summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-28 17:47:49 +0100
committerTom Hacohen <tom@stosb.com>2015-05-28 17:48:02 +0100
commit0d8e2479b3a7f0b4ca343435e8a24676fd6bfc67 (patch)
tree577251544afc1f6e9541378e47fb7a5df13e6bef
parent2fd7b01f4371e24208c245949d64fcc8f2042b7c (diff)
Adjust according to Eo changes.
-rw-r--r--src/lib/elm_atspi_bridge.c6
-rw-r--r--src/lib/elm_cnp.c4
-rw-r--r--src/lib/elm_interface_atspi_image.c20
-rw-r--r--src/lib/elm_widget.h2
4 files changed, 23 insertions, 9 deletions
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index ec9e2db15..7857c5c6a 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -3136,7 +3136,7 @@ static void _object_register(Eo *obj, char *path)
3136 eldbus_service_interface_register(_a11y_bus, path, &accessible_iface_desc); 3136 eldbus_service_interface_register(_a11y_bus, path, &accessible_iface_desc);
3137 3137
3138 event_infc = eldbus_service_interface_register(_a11y_bus, path, &event_iface_desc); 3138 event_infc = eldbus_service_interface_register(_a11y_bus, path, &event_iface_desc);
3139 eo_do(obj, eo_key_data_set("event_interface", event_infc, NULL)); 3139 eo_do(obj, eo_key_data_set("event_interface", event_infc));
3140 eo_do(obj, eo_event_callback_array_add(_events_cb(), event_infc)); 3140 eo_do(obj, eo_event_callback_array_add(_events_cb(), event_infc));
3141 3141
3142 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) 3142 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
@@ -3144,7 +3144,7 @@ static void _object_register(Eo *obj, char *path)
3144 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE)) 3144 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE))
3145 { 3145 {
3146 infc = eldbus_service_interface_register(_a11y_bus, path, &window_iface_desc); 3146 infc = eldbus_service_interface_register(_a11y_bus, path, &window_iface_desc);
3147 eo_do(obj, eo_key_data_set("window_interface", infc, NULL)); 3147 eo_do(obj, eo_key_data_set("window_interface", infc));
3148 eo_do(obj, eo_event_callback_array_add(_window_cb(), infc)); 3148 eo_do(obj, eo_event_callback_array_add(_window_cb(), infc));
3149 } 3149 }
3150 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN)) 3150 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
@@ -3176,7 +3176,7 @@ static void _object_unregister(void *obj)
3176 if (_a11y_bus && event_infc) 3176 if (_a11y_bus && event_infc)
3177 { 3177 {
3178 eldbus_service_object_unregister(event_infc); 3178 eldbus_service_object_unregister(event_infc);
3179 eo_do(obj, eo_key_data_set("event_interface", NULL, NULL)); 3179 eo_do(obj, eo_key_data_set("event_interface", NULL));
3180 } 3180 }
3181 3181
3182 eo_do(obj, eo_event_callback_del(EO_EV_DEL, _on_cache_item_del, NULL)); 3182 eo_do(obj, eo_event_callback_del(EO_EV_DEL, _on_cache_item_del, NULL));
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 2de648ae1..2916a6f55 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -2129,7 +2129,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
2129 drops = eina_list_append(drops, dropable); 2129 drops = eina_list_append(drops, dropable);
2130 if (!drops) goto error; 2130 if (!drops) goto error;
2131 dropable->obj = obj; 2131 dropable->obj = obj;
2132 eo_do(obj, eo_key_data_set("__elm_dropable", dropable, NULL)); 2132 eo_do(obj, eo_key_data_set("__elm_dropable", dropable));
2133 } 2133 }
2134 dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs)); 2134 dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
2135 2135
@@ -2857,7 +2857,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
2857 drops = eina_list_append(drops, dropable); 2857 drops = eina_list_append(drops, dropable);
2858 if (!drops) goto error; 2858 if (!drops) goto error;
2859 dropable->obj = obj; 2859 dropable->obj = obj;
2860 eo_do(obj, eo_key_data_set("__elm_dropable", dropable, NULL)); 2860 eo_do(obj, eo_key_data_set("__elm_dropable", dropable));
2861 } 2861 }
2862 dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs)); 2862 dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
2863 2863
diff --git a/src/lib/elm_interface_atspi_image.c b/src/lib/elm_interface_atspi_image.c
index 05c39284f..7e8eeefc8 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -8,10 +8,12 @@
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11static void 11static Eina_Bool
12_free_desc(void *data) 12_free_desc_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
13{ 13{
14 eina_stringshare_del(data); 14 eina_stringshare_del(data);
15
16 return EINA_TRUE;
15} 17}
16 18
17EOLIAN static const char* 19EOLIAN static const char*
@@ -26,8 +28,20 @@ _elm_interface_atspi_image_description_get(Eo *obj, void *sd EINA_UNUSED)
26EOLIAN static void 28EOLIAN static void
27_elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const char *description) 29_elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const char *description)
28{ 30{
31 const char *key = "atspi_image_description";
29 const char *descr = eina_stringshare_add(description); 32 const char *descr = eina_stringshare_add(description);
30 eo_do(obj, eo_key_data_set("atspi_image_description", descr, _free_desc)); 33 char *old_descr;
34 if (eo_do_ret(obj, old_descr, eo_key_data_get(key)))
35 {
36 eina_stringshare_del(old_descr);
37 eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _free_desc_cb, old_descr));
38 }
39
40 if (descr)
41 {
42 eo_do(obj, eo_key_data_set(key, descr),
43 eo_event_callback_add(EO_BASE_EVENT_DEL, _free_desc_cb, descr));
44 }
31} 45}
32 46
33EOLIAN static const char* 47EOLIAN static const char*
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 784c317cb..7ab1a587e 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -588,7 +588,7 @@ struct _Elm_Widget_Item_Signal_Data
588 588
589#define WIDGET_ITEM_DATA_SET(eo_obj, data) \ 589#define WIDGET_ITEM_DATA_SET(eo_obj, data) \
590{ \ 590{ \
591 eo_do(eo_obj, eo_key_data_set("__elm_widget_item_data", data, NULL)); \ 591 eo_do(eo_obj, eo_key_data_set("__elm_widget_item_data", data)); \
592} 592}
593 593
594struct _Elm_Widget_Item_Data 594struct _Elm_Widget_Item_Data