enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Fix build of IMF modules 

SVN revision: 80066
This commit is contained in:
Iván Briano 2012-12-03 13:33:03 +00:00
parent 4ec1d6c4bb
commit 509abd1aed
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -3713,7 +3713,7 @@ if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; th
AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support]) AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
], ],
[have_ecore_imf_ibus="no"]) [have_ecore_imf_ibus="no"])
IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"² IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"
IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}" IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
fi fi

6
src/Makefile_Ecore_Imf.am
View File

@ -89,6 +89,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore_x \ -I$(top_srcdir)/src/lib/ecore_x \
-I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_imf \
-I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \ -I$(top_builddir)/src/lib/eo \
-I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \
@ -101,7 +102,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
@EFL_COV_CFLAGS@ \ @EFL_COV_CFLAGS@ \
@IBUS_CFLAGS@ @IBUS_CFLAGS@
modules_ecore_immodules_ibus_ibus_la_LIBADD = \ modules_ecore_immodules_ibus_ibus_la_LIBADD = \
lib/ecore_imf/libecore_evas.la \ lib/ecore_evas/libecore_evas.la \
lib/ecore_imf/libecore_imf.la \ lib/ecore_imf/libecore_imf.la \
lib/ecore_x/libecore_x.la \ lib/ecore_x/libecore_x.la \
lib/ecore/libecore.la \ lib/ecore/libecore.la \
@ -129,6 +130,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore_x \ -I$(top_srcdir)/src/lib/ecore_x \
-I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_imf \
-I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \ -I$(top_builddir)/src/lib/eo \
-I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \
@ -141,7 +143,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
@EFL_COV_CFLAGS@ \ @EFL_COV_CFLAGS@ \
@SCIM_CFLAGS@ @SCIM_CFLAGS@
modules_ecore_immodules_scim_scim_la_LIBADD = \ modules_ecore_immodules_scim_scim_la_LIBADD = \
lib/ecore_imf/libecore_evas.la \ lib/ecore_evas/libecore_evas.la \
lib/ecore_imf/libecore_imf.la \ lib/ecore_imf/libecore_imf.la \
lib/ecore_x/libecore_x.la \ lib/ecore_x/libecore_x.la \
lib/ecore/libecore.la \ lib/ecore/libecore.la \

8
src/modules/ecore/immodules/scim/scim_imcontext.cpp
View File

@ -1455,7 +1455,7 @@ isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
/* Panel Slot functions */ /* Panel Slot functions */
static void static void
panel_slot_reload_config(int context __UNUSED__) panel_slot_reload_config(int context EINA_UNUSED)
{ {
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
_config->reload(); _config->reload();
@ -1834,7 +1834,7 @@ panel_finalize(void)
} }
static Eina_Bool static Eina_Bool
panel_iochannel_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler) panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
{ {
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
@ -2753,7 +2753,7 @@ slot_update_property(IMEngineInstanceBase *si,
} }
static void static void
slot_beep(IMEngineInstanceBase *si __UNUSED__) slot_beep(IMEngineInstanceBase *si EINA_UNUSED)
{ {
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
} }
@ -2886,7 +2886,7 @@ reload_config_callback(const ConfigPointer &config)
} }
static void static void
fallback_commit_string_cb(IMEngineInstanceBase *si __UNUSED__, fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED,
const WideString &str) const WideString &str)
{ {
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";