e_comp_object: remove the indicator object

The indicator object is deprecated. It is not used anymore.

Change-Id: I9618955456bcd418939695d455277f252193f618

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 5566abe97dc8d8516611fb51f347c7e8def42af4..df4632f5ad03e45343503adf42bffb09152338fb 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -806,17 +806,6 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
                }
           }
      }
-   if (cw->indicator.obj)
-     {
-        Evas_Object *indicator;
-        indicator = edje_object_part_swallow_get(cw->shobj, "e.swallow.indicator");
-        if (indicator != cw->indicator.obj)
-          {
-             edje_object_part_unswallow(cw->shobj, indicator);
-             edje_object_part_swallow(cw->shobj, "e.swallow.indicator", cw->indicator.obj);
-             e_comp_object_indicator_size_set(cw->smart_obj, cw->indicator.w, cw->indicator.h);
-          }
-     }
 
    evas_object_pass_events_set(cw->default_input_obj, pass_event_flag);
    evas_object_pass_events_set(cw->obj, EINA_TRUE);
@@ -4532,46 +4521,6 @@ e_comp_object_effect_object_part_swallow(Evas_Object *obj, const char *part_name
    return edje_object_part_swallow(cw->effect_obj, part_name, swallow_obj);
 }
 
-EINTERN void
-e_comp_object_indicator_swallow(Evas_Object *obj, Evas_Object *indicator)
-{
-   API_ENTRY;
-   if (cw->indicator.obj != indicator)
-     edje_object_part_unswallow(cw->shobj, cw->indicator.obj);
-   cw->indicator.obj = indicator;
-   edje_object_part_swallow(cw->shobj, "e.swallow.indicator", indicator);
-}
-
-EINTERN void
-e_comp_object_indicator_unswallow(Evas_Object *obj, Evas_Object *indicator)
-{
-   API_ENTRY;
-   if (cw->indicator.obj != indicator) return;
-   cw->indicator.obj = NULL;
-   edje_object_part_unswallow(cw->shobj, indicator);
-}
-
-EINTERN void
-e_comp_object_indicator_size_set(Evas_Object *obj, int w, int h)
-{
-   API_ENTRY;
-   Edje_Message_Int_Set *msg;
-
-   if (!cw->indicator.obj) return;
-
-   cw->indicator.w = w;
-   cw->indicator.h = h;
-
-   if (!cw->shobj) return;
-
-   msg = alloca(sizeof(Edje_Message_Int_Set) + (sizeof(int)));
-   msg->count = 2;
-   msg->val[0] = w;
-   msg->val[1] = h;
-   edje_object_message_send(cw->shobj, EDJE_MESSAGE_INT_SET, 0, msg);
-   edje_object_message_signal_process(cw->shobj);
-}
-
 /* buffer transform and scale are applied to e_comp_object and e_pixmap internaly */
 EINTERN void
 e_comp_object_map_update(Evas_Object *obj)

diff --git a/src/bin/compmgr/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h
index a44f4033c45b1e556aa9f9d6b7e6018f8798a40a..e4134af214fbfd1110675dbe8503f734fa19eb41 100644 (file)
--- a/src/bin/compmgr/e_comp_object_intern.h
+++ b/src/bin/compmgr/e_comp_object_intern.h
@@ -221,10 +221,6 @@ EINTERN Evas_Object *e_comp_object_content_get(Evas_Object* obj);
 EINTERN E_Client *e_comp_object_dim_client_get(void);
 EINTERN void      e_comp_object_dim_mask_set(Evas_Object *obj, Eina_Bool set);
 
-EINTERN void e_comp_object_indicator_swallow(Evas_Object *obj, Evas_Object *indicator);
-EINTERN void e_comp_object_indicator_unswallow(Evas_Object *obj, Evas_Object *indicator);
-EINTERN void e_comp_object_indicator_size_set(Evas_Object *obj, int w, int h);
-
 EINTERN Eina_Bool           e_comp_object_image_filter_set(Evas_Object *obj, E_Comp_Image_Filter filter);
 EINTERN E_Comp_Image_Filter e_comp_object_image_filter_get(Evas_Object *obj);
 

diff --git a/src/bin/server/e_tizen_launch_effect.c b/src/bin/server/e_tizen_launch_effect.c
index ef347ba7df6aab9e073a033216965887838057c8..e5630ad633cc6b54affcd0c78e6a7a4b33fc74f4 100644 (file)
--- a/src/bin/server/e_tizen_launch_effect.c
+++ b/src/bin/server/e_tizen_launch_effect.c
@@ -52,7 +52,6 @@ struct _E_Tizen_Launch_Effect_Splash
    E_Pixmap                  *ep;               /* pixmap for launch screen client */
    E_Client                  *ec;               /* client for launch screen image */
    Ecore_Timer               *timeout;          /* launch screen image hide timer */
-   Evas_Object               *indicator_obj;    /* plug object of indicator */
 
    Eina_Bool                  valid;            /* validation check */
    Eina_Bool                  replaced;
@@ -148,14 +147,6 @@ _launch_splash_off(E_Tizen_Launch_Effect_Splash *tzlaunch_splash)
          "Launchscreen hide | pid %d, replaced:%d, tzlaunch_pixmap:%p, ec_pixmap:%p",
          ec, tzlaunch_splash->pid, tzlaunch_splash->replaced, tzlaunch_splash->ep, ec->pixmap);
 
-   if (tzlaunch_splash->indicator_obj)
-     {
-        e_comp_object_indicator_unswallow(ec->frame, tzlaunch_splash->indicator_obj);
-        evas_object_del(tzlaunch_splash->indicator_obj);
-        evas_object_unref(tzlaunch_splash->indicator_obj);
-        tzlaunch_splash->indicator_obj = NULL;
-     }
-
    if ((ec->pixmap) &&
        (ec->pixmap == tzlaunch_splash->ep))
      {
@@ -300,7 +291,6 @@ _launchscreen_splash_setup(E_Tizen_Launch_Effect_Splash *splash,
    splash->path = eina_stringshare_add(pfname);
    splash->type = ftype;
    splash->indicator = indicator;
-   splash->indicator_obj = NULL;
    splash->angle = angle;
 
    if (indicator)
@@ -547,14 +537,6 @@ _tzlaunch_splash_iface_cb_owner(struct wl_client *client EINA_UNUSED, struct wl_
                    new_ec,
                    old_ec, new_ec, tzlaunch_splash->obj);
 
-             if (tzlaunch_splash->indicator_obj)
-               {
-                  e_mod_indicator_owner_set(new_ec);
-                  e_tzsh_indicator_srv_property_update(new_ec);
-                  e_comp_object_indicator_unswallow(old_ec->frame, tzlaunch_splash->indicator_obj);
-                  e_comp_object_indicator_swallow(new_ec->frame, tzlaunch_splash->indicator_obj);
-               }
-
              /* delete ec was created for launchscreen */
              e_comp_launchscrn_ec_remove(old_ec);