[elm_webview] remove glib dependency
authorEunmi Lee <eunmi15.lee@samsung.com>
Tue, 17 Aug 2010 10:33:06 +0000 (19:33 +0900)
committerEunmi Lee <eunmi15.lee@samsung.com>
Tue, 17 Aug 2010 10:34:55 +0000 (19:34 +0900)
configure.ac
src/lib/Makefile.am
src/lib/els_webview.c

index d7b4c3d..df12a4e 100755 (executable)
@@ -412,16 +412,6 @@ if test "x$want_elementary_ewebkit" != "xno"; then
        ],
        [have_elementary_ewebkit="no"]
     )
-    PKG_CHECK_MODULES([ELEMENTARY_EWEBKIT_SUPPORT],
-       [
-        glib-2.0
-        gobject-2.0
-        gthread-2.0
-       ],
-       [],
-       [have_elementary_ewebkit="no"]
-    )
-
 else
     have_elementary_ewebkit="no"
 fi
index 0562f98..5b82e2f 100644 (file)
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
-@ELEMENTARY_EWEBKIT_CFLAGS@ \
-@ELEMENTARY_EWEBKIT_SUPPORT_CFLAGS@
+@ELEMENTARY_EWEBKIT_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
 AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -153,5 +152,5 @@ els_webview.c
 
 
 libelementary_la_CFLAGS =
-libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_EWEBKIT_SUPPORT_LIBS@
+libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@
 libelementary_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
index 6c7f7d9..662a0b2 100644 (file)
@@ -6,8 +6,6 @@
 #include "elm_priv.h"
 
 #ifdef ELM_EWEBKIT
-#include <glib.h>
-#include <glib-object.h>
 #include <EWebKit.h>
 #include <cairo.h>
 
@@ -270,13 +268,18 @@ _elm_smart_webview_add(Evas *evas, Eina_Bool tiled)
 
    if (!_smart)
      {
-       // init g_thread
-       g_type_init();
-       if (!g_thread_get_initialized())
-         g_thread_init(NULL);
-
        ewk_handle = dlopen(EWEBKIT_PATH, RTLD_LAZY);
+       if (ewk_handle == NULL)
+         {
+            ERR("could not initialize ewk \n");
+            return NULL;
+         }
        cairo_handle = dlopen(CAIRO_PATH, RTLD_LAZY);
+       if (cairo_handle == NULL)
+         {
+            ERR("could not initialize cairo \n");
+            return NULL;
+         }
 
        // init ewk
        if (!ewk_init)