[edje-external] init+shutdown bugs are fixed

diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index af91e60..a9ed058 100644 (file)
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -3,6 +3,38 @@
 
 int _elm_log_dom = -1;
 
+static int init_count = 0;
+
+void
+external_elm_init(void)
+{
+   int argc = 0;
+   char **argv = NULL;
+
+   init_count++;
+   printf("elm_real_init\n");
+   if (init_count > 1) return;
+   ecore_app_args_get(&argc, &argv);
+   elm_init(argc, argv);
+}
+
+static void
+external_elm_shutdown(void)
+{
+   init_count--;
+   printf("elm_real_shutdown\n");
+   if (init_count > 1) return;
+   elm_shutdown();
+}
+
+static void
+_external_obj_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, 
+                                  _external_obj_del);
+   external_elm_shutdown();
+}
+
 void
 external_signal(void *data __UNUSED__, Evas_Object *obj, const char *signal, const char *source)
 {
@@ -105,6 +137,8 @@ external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_nam
        evas_object_smart_callback_add
          (obj, d->name, _external_signal_proxy_cb, ctxt);
      }
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, 
+                                  _external_obj_del, NULL);
 }
 
 void *
@@ -211,12 +245,6 @@ static Edje_External_Type_Info elm_external_types[] =
 static Eina_Bool
 elm_mod_init(void)
 {
-   int argc = 0;
-   char **argv = NULL;
-
-   ecore_app_args_get(&argc, &argv);
-   elm_init(argc, argv);
-
    _elm_log_dom = eina_log_domain_register("elm-externals", EINA_COLOR_LIGHTBLUE);
    edje_external_type_array_register(elm_external_types);
    return EINA_TRUE;
@@ -226,11 +254,9 @@ static void
 elm_mod_shutdown(void)
 {
    edje_external_type_array_unregister(elm_external_types);
-
    eina_log_domain_unregister(_elm_log_dom);
    _elm_log_dom = -1;
 
-   elm_shutdown();
 }
 
 EINA_MODULE_INIT(elm_mod_init);

diff --git a/src/edje_externals/elm_thumb.c b/src/edje_externals/elm_thumb.c
index 311ecc9..5166cdf 100644 (file)
--- a/src/edje_externals/elm_thumb.c
+++ b/src/edje_externals/elm_thumb.c
@@ -133,6 +133,7 @@ static Evas_Object *
 external_thumb_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name)
 {
    Evas_Object *parent, *obj;
+   external_elm_init();
    parent = elm_widget_parent_widget_get(edje);
    if (!parent) parent = edje;
    elm_need_ethumb(); /* extra command needed */

diff --git a/src/edje_externals/private.h b/src/edje_externals/private.h
index a4b5a88..90f3328 100644 (file)
--- a/src/edje_externals/private.h
+++ b/src/edje_externals/private.h
@@ -8,6 +8,7 @@ typedef struct {
     const char *label;
 } Elm_Params;
 
+void external_elm_init(void);
 void external_signal(void *data, Evas_Object *obj, const char *signal, const char *source);
 void external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_name);
 const char *external_translate(void *data, const char *orig);
@@ -53,6 +54,7 @@ static Evas_Object *                                \
 external_##type_name##_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name) \
 {                                                                      \
    Evas_Object *parent, *obj;                                          \
+   external_elm_init();                                                 \
    parent = elm_widget_parent_widget_get(edje);                        \
    if (!parent) parent = edje;                                         \
    obj = elm_##type_name##_add(parent);                                \