[entry] fixed bug in non-editable entry selection handlers and fixed migration issue

[framework/uifw/elementary.git] / src / edje_externals / elm_label.c

diff --git a/src/edje_externals/elm_label.c b/src/edje_externals/elm_label.c
index 589f698..39a3afe 100644 (file)
--- a/src/edje_externals/elm_label.c
+++ b/src/edje_externals/elm_label.c
@@ -2,6 +2,7 @@
 
 typedef struct _Elm_Params_Label
 {
+   Elm_Params base;
    const char* label;
 } Elm_Params_Label;
 
@@ -14,7 +15,7 @@ external_label_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, con
    else if (from_params) p = from_params;
    else return;
 
-   if (p->label) elm_label_label_set(obj, p->label);
+   if (p->label) elm_object_text_set(obj, p->label);
 }
 
 static Eina_Bool
@@ -24,7 +25,7 @@ external_label_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            elm_label_label_set(obj, param->s);
+            elm_object_text_set(obj, param->s);
             return EINA_TRUE;
          }
      }
@@ -42,7 +43,7 @@ external_label_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            param->s = elm_label_label_get(obj);
+            param->s = elm_object_text_get(obj);
             return EINA_TRUE;
          }
      }
@@ -83,11 +84,15 @@ static Evas_Object *external_label_content_get(void *data __UNUSED__,
 static void
 external_label_params_free(void *params)
 {
-   external_common_params_free(params);
+   Elm_Params_Label *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
 }
 
 static Edje_External_Param_Info external_label_params[] = {
    DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };