From: Jaehwan Kim <jae.hwan.kim@samsung.com>
Date: Thu, 22 Dec 2011 07:09:09 +0000 (+0900)
Subject: [*][controlbar] delete system icon.
X-Git-Tag: REL_F_I9500_20120125_1~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aef47df44513acd2df7901bb1a28a3d66c4e8981;p=framework%2Fuifw%2Felementary.git

[*][controlbar] delete system icon.

Change-Id: I2527bcc97546bd8998f12036f8ef146e74558c73
---

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index d5c32cc..762c009 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -29189,15 +29189,6 @@ extern "C" {
     */
 
    /* Control Bar */
-   #define CONTROLBAR_SYSTEM_ICON_ALBUMS "controlbar_albums"
-   #define CONTROLBAR_SYSTEM_ICON_ARTISTS "controlbar_artists"
-   #define CONTROLBAR_SYSTEM_ICON_SONGS "controlbar_songs"
-   #define CONTROLBAR_SYSTEM_ICON_PLAYLIST "controlbar_playlist"
-   #define CONTROLBAR_SYSTEM_ICON_MORE "controlbar_more"
-   #define CONTROLBAR_SYSTEM_ICON_CONTACTS "controlbar_contacts"
-   #define CONTROLBAR_SYSTEM_ICON_DIALER "controlbar_dialer"
-   #define CONTROLBAR_SYSTEM_ICON_FAVORITES "controlbar_favorites"
-   #define CONTROLBAR_SYSTEM_ICON_LOGS "controlbar_logs"
 
    typedef enum _Elm_Controlbar_Mode_Type
      {
diff --git a/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c
index 13329b7..26f0a9f 100644
--- a/src/lib/elm_controlbar.c
+++ b/src/lib/elm_controlbar.c
@@ -872,10 +872,8 @@ _create_item_icon(Evas_Object *obj, Elm_Controlbar_Item * it, char *part)
 
    Evas_Object *icon;
    icon = elm_icon_add(obj);
-   if (!elm_icon_standard_set(icon, it->icon_path))
-     {
-        elm_icon_file_set(icon, it->icon_path, NULL);
-     }
+
+   elm_icon_file_set(icon, it->icon_path, NULL);
 
    evas_object_size_hint_min_set(icon, 40, 40);
    evas_object_size_hint_max_set(icon, 100, 100);