Removed deprecated api calls

The #ifdefs for deprecated EFL calls are not longer neccessary as
the latest EFL libraries in Tizen are updated. Removing them to get
rid of build warnings.

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/messages/overview.c b/messages/overview.c
index 795aec5..b27a31a 100644 (file)
--- a/messages/overview.c
+++ b/messages/overview.c
@@ -1044,14 +1044,8 @@ Evas_Object *overview_add(Evas_Object *parent)
        elm_object_style_set(genlist, "messages-overview");
        elm_genlist_homogeneous_set(genlist, EINA_TRUE);
 
-
-#ifdef HAVE_TIZEN
-       elm_genlist_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF,
-                                       ELM_SCROLLER_POLICY_AUTO);
-#else
        elm_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF,
                                ELM_SCROLLER_POLICY_AUTO);
-#endif
 
        itc = elm_genlist_item_class_new();
        EINA_SAFETY_ON_NULL_GOTO(itc, err_itc);

diff --git a/tizen/answer_daemon.c b/tizen/answer_daemon.c
index 08581f1..757621c 100644 (file)
--- a/tizen/answer_daemon.c
+++ b/tizen/answer_daemon.c
@@ -143,11 +143,7 @@ static void _call_screen_show(Call_Screen *cs)
        icon = elm_icon_add(cs->layout);
 
        if (strcmp("", c->img) != 0) {
-#ifdef HAVE_TIZEN
-               elm_icon_file_set(icon, c->img, NULL);
-#else
                elm_image_file_set(icon, c->img, NULL);
-#endif
        } else
                elm_icon_standard_set(icon, "no-picture");
 

diff --git a/utils/simple-popup.c b/utils/simple-popup.c
index ccfc132..f397626 100644 (file)
--- a/utils/simple-popup.c
+++ b/utils/simple-popup.c
@@ -128,14 +128,8 @@ void simple_popup_message_set(Evas_Object *p, const char *msg)
                elm_object_style_set(en, "dialer-popup");
                elm_entry_editable_set(en, EINA_FALSE);
                elm_entry_scrollable_set(en, EINA_TRUE);
-#ifdef HAVE_TIZEN
-               /* old, deprecated API */
-               elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF,
-                                               ELM_SCROLLER_POLICY_AUTO);
-#else
                elm_scroller_policy_set(en, ELM_SCROLLER_POLICY_OFF,
                                        ELM_SCROLLER_POLICY_AUTO);
-#endif
 
                evas_object_event_callback_add(en, EVAS_CALLBACK_DEL,
                                        _simple_popup_message_del,
@@ -163,14 +157,8 @@ void simple_popup_entry_enable(Evas_Object *p)
        elm_object_style_set(en, "dialer-popup-editable");
        elm_entry_editable_set(en, EINA_TRUE);
        elm_entry_scrollable_set(en, EINA_TRUE);
-#ifdef HAVE_TIZEN
-       /* old, deprecated API */
-       elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF,
-                                       ELM_SCROLLER_POLICY_AUTO);
-#else
        elm_scroller_policy_set(en, ELM_SCROLLER_POLICY_OFF,
                                ELM_SCROLLER_POLICY_AUTO);
-#endif
 
        evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND,
                                                EVAS_HINT_EXPAND);

diff --git a/utils/util.c b/utils/util.c
index 7b72681..0949b33 100644 (file)
--- a/utils/util.c
+++ b/utils/util.c
@@ -137,16 +137,12 @@ Evas_Object *picture_icon_get(Evas_Object *parent, const char *picture)
        if (!picture || *picture == '\0')
                elm_icon_standard_set(icon, "no-picture");
        else {
-#ifdef HAVE_TIZEN
-               elm_icon_file_set(icon, picture, NULL);
-#else
                char path[PATH_MAX];
                const char *prefix;
                prefix = efreet_config_home_get();
                snprintf(path, sizeof(path), "%s/%s/%s", prefix, PACKAGE_NAME,
                                picture);
                elm_image_file_set(icon, path, NULL);
-#endif
        }
        return icon;
 }