From 3f0e075876737650f52b153be30b228b0653cc65 Mon Sep 17 00:00:00 2001 From: Eunmi Lee Date: Tue, 17 Aug 2010 19:33:06 +0900 Subject: [PATCH] [elm_webview] remove glib dependency --- configure.ac | 10 ---------- src/lib/Makefile.am | 5 ++--- src/lib/els_webview.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index d7b4c3d..df12a4e 100755 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0562f98..5b82e2f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -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@ diff --git a/src/lib/els_webview.c b/src/lib/els_webview.c index 6c7f7d9..662a0b2 100644 --- a/src/lib/els_webview.c +++ b/src/lib/els_webview.c @@ -6,8 +6,6 @@ #include "elm_priv.h" #ifdef ELM_EWEBKIT -#include -#include #include #include @@ -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) -- 2.7.4