Merge "custom eail widget implementation" into tizen

[platform/core/uifw/eail.git] / eail / eail.c

diff --git a/eail/eail.c b/eail/eail.c
index 507eb5e..8af6055 100644 (file)
--- a/eail/eail.c
+++ b/eail/eail.c
@@ -22,6 +22,10 @@
  * @brief EAIL initialization
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <Elementary.h>
 
 #include <gmodule.h>
@@ -74,7 +78,7 @@ static AtkObject *eail_atk_last_focused_obj = NULL;
  */
 static const gchar * eail_get_toolkit_name(void)
 {
-   return "elementary";
+   return "EAIL";
 }
 
 /**
@@ -84,9 +88,7 @@ static const gchar * eail_get_toolkit_name(void)
  */
 static const gchar * eail_get_toolkit_version(void)
 {
-   return g_strdup_printf("%i.%i.%i", elm_version->major,
-                          elm_version->minor,
-                          elm_version->micro);
+   return g_strdup(PACKAGE_VERSION);
 }
 
 /**
@@ -329,9 +331,9 @@ elm_modapi_init(void *m)
      }
 
    initialized = TRUE;
-
+#if !GLIB_CHECK_VERSION(2,35,0)
    g_type_init();
-
+#endif
    listener_list = g_hash_table_new_full
                   (g_int_hash, g_int_equal, NULL, eail_listener_info_destroy);