Merge "[Copy&Paste] remove "Paste" button when CBHM has no item"

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

diff --git a/src/edje_externals/elm_colorpalette.c b/src/edje_externals/elm_colorpalette.c
index d49dba9..b1dabb5 100644 (file)
--- a/src/edje_externals/elm_colorpalette.c
+++ b/src/edje_externals/elm_colorpalette.c
@@ -25,7 +25,7 @@ external_colorpalette_state_set(void *data __UNUSED__, Evas_Object *obj, const v
 }
 
 static Eina_Bool
-external_colorpalette_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+external_colorpalette_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "row"))
      {
@@ -58,14 +58,14 @@ external_colorpalette_param_set(void *data __UNUSED__, Evas_Object *obj, const E
 }
 
 static Eina_Bool
-external_colorpalette_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+external_colorpalette_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param __UNUSED__)
 {
        return EINA_FALSE;
    //FIX ME:getter functions not provided
 }
 
 static void *
-external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
 {
    Elm_Params_colorpalette *mem;
    Edje_External_Param *param;
@@ -98,7 +98,7 @@ external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj, cons
          {
            mem->color = (Elm_Colorpalette_Color*) calloc (mem->color_num, sizeof(Elm_Colorpalette_Color));
            s = (char*)param->i;
-           while(k <(mem->color_num) && (ll <= strlen(s)))
+           while(k <(mem->color_num) && (ll <= (int)strlen(s)))
              {
                   if(d == 0)
                    {
@@ -147,10 +147,12 @@ static Evas_Object *external_colorpalette_content_get(void *data __UNUSED__,
 static void
 external_colorpalette_params_free(void *params)
 {
-       Elm_Params_colorpalette *mem = params;
-    if(mem->color)free(mem->color);
-       if(mem->color_set)free(mem->color_set) ;
-       if(mem)free(mem);
+   Elm_Params_colorpalette *mem = params;
+   if (mem->color)
+     free(mem->color);
+   if (mem->color_set)
+     free(mem->color_set) ;
+   free(params);
 }
 
 static Edje_External_Param_Info external_colorpalette_params[] = {