From: Gwanglim Lee <gl77.lee@samsung.com>
Date: Thu, 1 Dec 2016 11:53:11 +0000 (+0900)
Subject: e_info: prevents calling evas_object_image_alpha_get from the non-image type.
X-Git-Tag: submit/tizen/20161202.080939~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a852b9d097aee70afb9a6267569b5928dab0695c;p=platform%2Fupstream%2Fenlightenment.git

e_info: prevents calling evas_object_image_alpha_get from the non-image type.

Change-Id: I18a7cef07a50afaeadbd62615b440c38324c33ac
---

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index f9c41f96be..5b8ec040b5 100644
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -245,7 +245,6 @@ _e_info_client_cb_compobjs(const Eldbus_Message *msg)
                                                 &cobj.opmode,
                                                 &cobj.x, &cobj.y, &cobj.w, &cobj.h,
                                                 &cobj.r, &cobj.g, &cobj.b, &cobj.a,
-                                                &cobj.alpha,
                                                 &cobj.pass_events,
                                                 &cobj.freeze_events,
                                                 &cobj.focus,
@@ -288,7 +287,7 @@ _e_info_client_cb_compobjs(const Eldbus_Message *msg)
                  "|%4d,%4d %4dx%4d|%s|%s%s%s|%s|",
                  cobj.type,
                  cobj.x, cobj.y, cobj.w, cobj.h,
-                 cobj.alpha == 1 ? "A" : " ",
+                 cobj.img.alpha == 1 ? "A" : " ",
                  cobj.pass_events == 1 ? "p" : " ",
                  cobj.freeze_events == 1 ? "z" : " ",
                  cobj.focus == 1 ? "F" : " ",
@@ -301,7 +300,7 @@ _e_info_client_cb_compobjs(const Eldbus_Message *msg)
                  cobj.opmode,
                  cobj.x, cobj.y, cobj.w, cobj.h,
                  cobj.r, cobj.g, cobj.b, cobj.a,
-                 cobj.alpha == 1 ? "A" : " ",
+                 cobj.img.alpha == 1 ? "A" : " ",
                  cobj.pass_events == 1 ? "p" : " ",
                  cobj.freeze_events == 1 ? "z" : " ",
                  cobj.focus == 1 ? "F" : " ",
diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index ac17a6ca40..96f38afb10 100644
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -238,7 +238,6 @@ _compobj_info_get(Evas_Object *po, Evas_Object *o, int depth)
 
    evas_object_geometry_get(o, &cobj->x, &cobj->y, &cobj->w, &cobj->h);
    evas_object_color_get(o, &cobj->r, &cobj->g, &cobj->b, &cobj->a);
-   cobj->alpha = evas_object_image_alpha_get(o);
    cobj->pass_events = evas_object_pass_events_get(o);
    cobj->freeze_events = evas_object_freeze_events_get(o);
    cobj->focus = evas_object_focus_get(o);
@@ -461,7 +460,6 @@ _e_info_server_cb_compobjs(const Eldbus_Service_Interface *iface EINA_UNUSED, co
                                              cobj->opmode,
                                              cobj->x, cobj->y, cobj->w, cobj->h,
                                              cobj->r, cobj->g, cobj->b, cobj->a,
-                                             cobj->alpha,
                                              cobj->pass_events,
                                              cobj->freeze_events,
                                              cobj->focus,
diff --git a/src/bin/e_info_shared_types.h b/src/bin/e_info_shared_types.h
index 416be6c660..7741cb1068 100644
--- a/src/bin/e_info_shared_types.h
+++ b/src/bin/e_info_shared_types.h
@@ -11,7 +11,7 @@ typedef enum
 /* -------------------------------------------------------------------------- */
 /* COMPOSITE OBJECTS                                                          */
 /* -------------------------------------------------------------------------- */
-#define SIGNATURE_COMPOBJS_CLIENT "uissisiiiiiiiibbbbbsssdbsssuiiiiiiiibb"
+#define SIGNATURE_COMPOBJS_CLIENT "uissisiiiiiiiibbbbsssdbsssuiiiiiiiibb"
 
 typedef struct _E_Info_Comp_Obj
 {
@@ -24,7 +24,6 @@ typedef struct _E_Info_Comp_Obj
    int             x, y, w, h;     // i i i i
    int             r, g, b, a;     // i i i i
 
-   Eina_Bool       alpha;          // b
    Eina_Bool       pass_events;    // b
    Eina_Bool       freeze_events;  // b
    Eina_Bool       focus;          // b