Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

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

diff --git a/src/edje_externals/elm_hoversel.c b/src/edje_externals/elm_hoversel.c
index 08b2dce..d345316 100644 (file)
--- a/src/edje_externals/elm_hoversel.c
+++ b/src/edje_externals/elm_hoversel.c
@@ -3,6 +3,7 @@
 typedef struct _Elm_Params_Hoversel
 {
    Elm_Params base;
+   const char *label;
    Evas_Object *icon;
    Eina_Bool horizontal:1;
    Eina_Bool horizontal_exists:1;
@@ -17,10 +18,10 @@ external_hoversel_state_set(void *data __UNUSED__, Evas_Object *obj, const void
    else if (from_params) p = from_params;
    else return;
 
-   if (p->base.label)
-     elm_hoversel_label_set(obj, p->base.label);
+   if (p->label)
+     elm_object_text_set(obj, p->label);
    if (p->icon)
-     elm_hoversel_icon_set(obj, p->icon);
+     elm_object_part_content_set(obj, "icon", p->icon);
    if (p->horizontal_exists)
       elm_hoversel_horizontal_set(obj, p->horizontal);
 }
@@ -32,7 +33,7 @@ external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            elm_hoversel_label_set(obj, param->s);
+            elm_object_text_set(obj, param->s);
             return EINA_TRUE;
          }
      }
@@ -42,7 +43,7 @@ external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
-            elm_hoversel_icon_set(obj, icon);
+            elm_object_part_content_set(obj, "icon", icon);
             return EINA_TRUE;
          }
      }
@@ -68,7 +69,7 @@ external_hoversel_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            param->s = elm_hoversel_label_get(obj);
+            param->s = elm_object_text_get(obj);
             return EINA_TRUE;
          }
      }
@@ -93,13 +94,13 @@ external_hoversel_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
 }
 
 static void *
-external_hoversel_params_parse(void *data, Evas_Object *obj, const Eina_List *params)
+external_hoversel_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Hoversel *mem;
    Edje_External_Param *param;
    const Eina_List *l;
 
-   mem = external_common_params_parse(Elm_Params_Hoversel, data, obj, params);
+   mem = calloc(1, sizeof(Elm_Params_Hoversel));
    if (!mem)
      return NULL;
 
@@ -112,26 +113,32 @@ external_hoversel_params_parse(void *data, Evas_Object *obj, const Eina_List *pa
             mem->horizontal = !!param->i;
             mem->horizontal_exists = EINA_TRUE;
          }
+       else if (!strcmp(param->name, "label"))
+         mem->label = eina_stringshare_add(param->s);
      }
 
    return mem;
 }
 
 static Evas_Object *external_hoversel_content_get(void *data __UNUSED__,
-               const Evas_Object *obj, const char *content)
+               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
 {
-       ERR("so content");
+       ERR("No content.");
        return NULL;
 }
 
  static void
 external_hoversel_params_free(void *params)
 {
-   external_common_params_free(params);
+   Elm_Params_Hoversel *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
 }
 
 static Edje_External_Param_Info external_hoversel_params[] = {
    DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
    EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
    EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL