remove edje file changed handling

this matches the 8edc879cc28e7f69c110b4b9db6e611856787c6f commit in
efl where edje file changed singals are now gone. this creates nothing
but trouble. please see the efl commit log for details.

diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c
index 2120e37..d746f4b 100644 (file)
--- a/legacy/elementary/src/lib/elm_bg.c
+++ b/legacy/elementary/src/lib/elm_bg.c
@@ -142,19 +142,6 @@ _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
 }
 
-static void
-_elm_bg_file_reload(void *data, Evas_Object *obj,
-                    const char *emission EINA_UNUSED,
-                    const char *source EINA_UNUSED)
-{
-   Evas_Object *bg = data;
-   const char *file;
-   const char *group;
-
-   edje_object_file_get(obj, &file, &group);
-   elm_bg_file_set(bg, file, group);
-}
-
 EOLIAN static Eina_Bool
 _elm_bg_file_set(Eo *obj, Elm_Bg_Data *sd, const char *file, const char *group)
 {
@@ -177,10 +164,6 @@ _elm_bg_file_set(Eo *obj, Elm_Bg_Data *sd, const char *file, const char *group)
         sd->img = edje_object_add
             (evas_object_evas_get(wd->resize_obj));
         int_ret = edje_object_file_set(sd->img, file, group);
-        edje_object_signal_callback_del
-          (sd->img, "edje,change,file", "edje", _elm_bg_file_reload);
-        edje_object_signal_callback_add
-          (sd->img, "edje,change,file", "edje", _elm_bg_file_reload, obj);
      }
    else
      {

diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index bf52dd3..e83d8a6 100644 (file)
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -273,18 +273,6 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
 }
 
 static void
-_reload_theme(void *data, Evas_Object *obj,
-              const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
-{
-   Evas_Object *layout = data;
-   const char *file;
-   const char *group;
-
-   edje_object_file_get(obj, &file, &group);
-   elm_layout_file_set(layout, file, group);
-}
-
-static void
 _visuals_refresh(Evas_Object *obj,
                  Elm_Layout_Smart_Data *sd)
 {
@@ -297,13 +285,6 @@ _visuals_refresh(Evas_Object *obj,
    _parts_cursors_apply(sd);
 
    eo_do(obj, elm_obj_layout_sizing_eval());
-
-   edje_object_signal_callback_del(wd->resize_obj,
-                                   "edje,change,file", "edje",
-                                   _reload_theme);
-   edje_object_signal_callback_add(wd->resize_obj,
-                                   "edje,change,file", "edje",
-                                   _reload_theme, obj);
 }
 
 EOLIAN static Eina_Bool

diff --git a/legacy/elementary/src/lib/elm_theme.c b/legacy/elementary/src/lib/elm_theme.c
index c35d374..67cea3e 100644 (file)
--- a/legacy/elementary/src/lib/elm_theme.c
+++ b/legacy/elementary/src/lib/elm_theme.c
@@ -264,59 +264,13 @@ _elm_theme_data_find(Elm_Theme *th, const char *key)
    return NULL;
 }
 
-static void _elm_theme_idler_clean(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
-
-static Eina_Bool
-_elm_theme_reload_idler(void *data)
-{
-   Evas_Object *elm = data;
-
-   elm_widget_theme(elm);
-   evas_object_data_del(elm, "elm-theme-reload-idler");
-   evas_object_event_callback_del(elm, EVAS_CALLBACK_DEL, _elm_theme_idler_clean);
-   return EINA_FALSE;
-}
-
-static void
-_elm_theme_idler_clean(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   Ecore_Idler *idler;
-
-   idler = evas_object_data_get(obj, "elm-theme-reload-idler");
-   ecore_idler_del(idler);
-   evas_object_data_del(obj, "elm-theme-reload-idler");
-}
-
-static void
-_elm_theme_reload(void *data EINA_UNUSED, Evas_Object *obj,
-                  const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
-{
-   Evas_Object *elm;
-
-   elm = evas_object_data_get(obj, "elm-parent");
-   if (elm)
-     {
-        evas_object_event_callback_add(elm, EVAS_CALLBACK_DEL, _elm_theme_idler_clean, NULL);
-        evas_object_data_set(elm, "elm-theme-reload-idler", ecore_idler_add(_elm_theme_reload_idler, elm));
-     }
-}
-
 Eina_Bool
 _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style)
 {
    Elm_Theme *th = NULL;
-   void *test;
 
    if (parent) th = elm_widget_theme_get(parent);
    if (!_elm_theme_set(th, o, clas, group, style)) return EINA_FALSE;
-
-   test = evas_object_data_get(o, "edje,theme,watcher");
-   if (!test)
-     {
-        edje_object_signal_callback_add(o, "edje,change,file", "edje",
-                                        _elm_theme_reload, NULL);
-        evas_object_data_set(o, "edje,theme,watcher", (void*) -1);
-     }
    return EINA_TRUE;
 }