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

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

diff --git a/src/edje_externals/elm_notify.c b/src/edje_externals/elm_notify.c
index 4f1a027..0096914 100644 (file)
--- a/src/edje_externals/elm_notify.c
+++ b/src/edje_externals/elm_notify.c
@@ -36,7 +36,7 @@ static Elm_Notify_Orient _orient_get(const char *orient)
    assert(sizeof(orients)/sizeof(orients[0]) ==
          ELM_NOTIFY_ORIENT_LAST + 1);
 
-   for (i = 0; i < sizeof(orients)/sizeof(orients[0]); i++)
+   for (i = 0; i < ELM_NOTIFY_ORIENT_LAST; i++)
      if (!strcmp(orient, orients[i])) return i;
 
    return ELM_NOTIFY_ORIENT_LAST;
@@ -53,7 +53,7 @@ static void external_notify_state_set(void *data __UNUSED__,
        else return;
 
        if (p->content) {
-               elm_notify_content_set(obj, p->content);
+               elm_object_content_set(obj, p->content);
        }
        if (p->repeat_events_exists)
                elm_notify_repeat_events_set(obj, p->repeat_events);
@@ -76,7 +76,7 @@ static Eina_Bool external_notify_param_set(void *data __UNUSED__,
                Evas_Object *content = external_common_param_edje_object_get(obj, param);
                if ((strcmp(param->s, "")) && (!content))
                        return EINA_FALSE;
-               elm_notify_content_set(obj, content);
+               elm_object_content_set(obj, content);
                return EINA_TRUE;
        }
        else if ((!strcmp(param->name, "repeat_events"))
@@ -176,7 +176,7 @@ static Evas_Object *external_notify_content_get(void *data __UNUSED__,
                const Evas_Object *obj, const char *content)
 {
        if (!strcmp(content, "content"))
-               return elm_notify_content_get(obj);
+               return elm_object_content_get(obj);
 
        ERR("unknown content '%s'", content);
        return NULL;