fixed plugin image size problem

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

diff --git a/src/edje_externals/elm_entry.c b/src/edje_externals/elm_entry.c
index d4d51b9..910746f 100644 (file)
--- a/src/edje_externals/elm_entry.c
+++ b/src/edje_externals/elm_entry.c
@@ -25,8 +25,8 @@ typedef struct _Elm_Params_Entry
 
 #define CHOICE_GET(CHOICES, STR)                \
   unsigned int i;                               \
-  for (i = 0; i < sizeof(CHOICES); i++)         \
-    if (strcmp(STR, CHOICES[i]) == 0)           \
+  for (i = 0; i < sizeof(CHOICES)/sizeof (CHOICES)[0]; i++)         \
+    if (strcmp((STR), (CHOICES)[i]) == 0)           \
       return i
 
 
@@ -56,9 +56,9 @@ external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
    if (p->label)
      elm_object_text_set(obj, p->label);
    if (p->icon)
-     elm_entry_icon_set(obj, p->icon);
+     elm_object_part_content_set(obj, "icon", p->icon);
    if (p->entry)
-     elm_entry_entry_set(obj, p->entry);
+     elm_object_text_set(obj, p->entry);
    if (p->scrollable_exists)
      elm_entry_scrollable_set(obj, p->scrollable);
    if (p->single_line_exists)
@@ -100,7 +100,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
              Evas_Object *icon = external_common_param_icon_get(obj, param);
-             elm_entry_icon_set(obj, icon);
+             elm_object_part_content_set(obj, "icon", icon);
              return EINA_TRUE;
           }
      }
@@ -108,7 +108,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
-             elm_entry_entry_set(obj, param->s);
+             elm_object_text_set(obj, param->s);
              return EINA_TRUE;
           }
      }
@@ -122,7 +122,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      }
    else if (!strcmp(param->name, "single line"))
      {
-        if(param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
              elm_entry_single_line_set(obj, param->i);
              return EINA_TRUE;
@@ -130,7 +130,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      }
    else if (!strcmp(param->name, "password"))
      {
-        if(param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
              elm_entry_password_set(obj, param->i);
              return EINA_TRUE;
@@ -204,7 +204,7 @@ external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
      {
         if (param->type ==  EDJE_EXTERNAL_PARAM_TYPE_STRING)
           {
-             param->s = elm_entry_entry_get(obj);
+             param->s = elm_object_text_get(obj);
              return EINA_TRUE;
           }
      }
@@ -338,10 +338,10 @@ external_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_
 }
 
 static Evas_Object *external_entry_content_get(void *data __UNUSED__,
-               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+                                               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
 {
-       ERR("No content.");
-       return NULL;
+   ERR("No content.");
+   return NULL;
 }
 
 static void