[src/edje_externals/elm_button.c] Updated the external interfaces for elm_button.
authorRajeev Ranjan <rajeev.r@samsung.com>
Fri, 12 Nov 2010 04:38:21 +0000 (10:08 +0530)
committerRajeev Ranjan <rajeev.r@samsung.com>
Fri, 12 Nov 2010 04:38:21 +0000 (10:08 +0530)
src/edje_externals/elm_button.c

index 2ed7987..8847b35 100644 (file)
@@ -3,6 +3,7 @@
 typedef struct _Elm_Params_Button
 {
    Elm_Params base;
+   const char *label;
    Evas_Object *icon;
 } Elm_Params_Button;
 
@@ -15,8 +16,8 @@ external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f
    else if (from_params) p = from_params;
    else return;
 
-   if (p->base.label)
-     elm_button_label_set(obj, p->base.label);
+   if (p->label)
+     elm_button_label_set(obj, p->label);
    if (p->icon)
      elm_button_icon_set(obj, p->icon);
 }
@@ -73,34 +74,49 @@ external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
 }
 
 static void *
-external_button_params_parse(void *data, Evas_Object *obj, const Eina_List *params)
+external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
 {
    Elm_Params_Button *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
 
-   mem = external_common_params_parse(Elm_Params_Button, data, obj, params);
+   mem = calloc(1, sizeof(Elm_Params_Button));
    if (!mem)
      return NULL;
 
    external_common_icon_param_parse(&mem->icon, obj, params);
 
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label"))
+          {
+             mem->label = eina_stringshare_add(param->s);
+             break;
+          }
+     }
+
    return mem;
 }
 
 static Evas_Object *external_button_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_button_params_free(void *params)
 {
-   external_common_params_free(params);
+   Elm_Params_Button *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
 }
 
 static Edje_External_Param_Info external_button_params[] = {
    DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
    EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };