summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-02-15 15:04:20 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-02-15 15:35:38 +0900
commita568d26f722140dcf2169e7cf474ca6366701ef5 (patch)
tree502e69ecd45cfcb79a7ed1284990da57038fe6c3 /src/lib/elementary
parentb7213f2d640d03495b50f38287a3c8642161827f (diff)
evas & elm: Fix invalid uses of efl_data_ref(obj, NULL)
The data class should be specified for debug purposes. Also, this fixes invalid uses inside the smart object implementation where it assumed that the smart data was part of the eo data. It may not (legacy objects).
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_photocam.c2
-rw-r--r--src/lib/elementary/elm_thumb.c4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 489d19dca8..20a6d0b18f 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4588,7 +4588,7 @@ _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
4588 4588
4589 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj)); 4589 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
4590 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS); 4590 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
4591 efl_data_ref(obj, NULL); 4591 efl_data_ref(obj, MY_CLASS);
4592 pan_data->wobj = obj; 4592 pan_data->wobj = obj;
4593 pan_data->wsd = priv; 4593 pan_data->wsd = priv;
4594 4594
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index fe79a12c22..4fb5fd0ed3 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5628,7 +5628,7 @@ _elm_genlist_efl_canvas_group_group_add(Eo *obj, Elm_Genlist_Data *priv)
5628 5628
5629 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj)); 5629 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
5630 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS); 5630 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
5631 efl_data_ref(obj, NULL); 5631 efl_data_ref(obj, MY_CLASS);
5632 pan_data->wobj = obj; 5632 pan_data->wobj = obj;
5633 pan_data->wsd = priv; 5633 pan_data->wsd = priv;
5634 5634
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index bf00317774..0a93398291 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4133,7 +4133,7 @@ _elm_map_efl_canvas_group_group_add(Eo *obj, Elm_Map_Data *priv)
4133 4133
4134 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj)); 4134 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
4135 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS); 4135 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
4136 efl_data_ref(obj, NULL); 4136 efl_data_ref(obj, MY_CLASS);
4137 pan_data->wobj = obj; 4137 pan_data->wobj = obj;
4138 pan_data->wsd = priv; 4138 pan_data->wsd = priv;
4139 4139
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 3ed1bb3c86..0dd18fc7ea 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -1420,7 +1420,7 @@ _elm_photocam_efl_canvas_group_group_add(Eo *obj, Elm_Photocam_Data *priv)
1420 1420
1421 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj)); 1421 priv->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
1422 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS); 1422 pan_data = efl_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
1423 efl_data_ref(obj, NULL); 1423 efl_data_ref(obj, MY_CLASS);
1424 pan_data->wobj = obj; 1424 pan_data->wobj = obj;
1425 pan_data->wsd = priv; 1425 pan_data->wsd = priv;
1426 1426
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 41f2cbf3b9..205a033653 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -229,7 +229,7 @@ _thumb_finish(Elm_Thumb_Data *sd,
229 sd->thumb.retry = EINA_TRUE; 229 sd->thumb.retry = EINA_TRUE;
230 230
231 retry = eina_list_append(retry, sd); 231 retry = eina_list_append(retry, sd);
232 efl_data_ref(sd->obj, NULL); 232 efl_data_ref(sd->obj, MY_CLASS);
233 return; 233 return;
234 } 234 }
235 } 235 }
@@ -259,7 +259,7 @@ _thumb_finish(Elm_Thumb_Data *sd,
259 sd->thumb.retry = EINA_TRUE; 259 sd->thumb.retry = EINA_TRUE;
260 260
261 retry = eina_list_append(retry, sd); 261 retry = eina_list_append(retry, sd);
262 efl_data_ref(sd->obj, NULL); 262 efl_data_ref(sd->obj, MY_CLASS);
263 return; 263 return;
264 } 264 }
265 265