summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Briano <sachieru@gmail.com>2012-12-03 13:33:03 +0000
committerIván Briano <sachieru@gmail.com>2012-12-03 13:33:03 +0000
commit509abd1aedcca363675b1ca95c82143f47a69db6 (patch)
tree612d1e888c959310722dac4d9a7806a7c89aedda
parent4ec1d6c4bb1cc3ecf4348d9d778172b7c2a8615b (diff)
Fix build of IMF modules
SVN revision: 80066
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile_Ecore_Imf.am6
-rw-r--r--src/modules/ecore/immodules/scim/scim_imcontext.cpp8
3 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index ce46fb1e6c..b04f4dd452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3713,7 +3713,7 @@ if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; th
3713 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support]) 3713 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
3714 ], 3714 ],
3715 [have_ecore_imf_ibus="no"]) 3715 [have_ecore_imf_ibus="no"])
3716 IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"² 3716 IBUS_CFLAGS="${GLIB_CFLAGS} ${IBUS_CFLAGS}"
3717 IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}" 3717 IBUS_LIBS="${GLIB_LIBS} ${IBUS_LIBS}"
3718fi 3718fi
3719 3719
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 820ae2b12a..5634b909cd 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -89,6 +89,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
89-I$(top_srcdir)/src/lib/ecore_x \ 89-I$(top_srcdir)/src/lib/ecore_x \
90-I$(top_srcdir)/src/lib/ecore_imf \ 90-I$(top_srcdir)/src/lib/ecore_imf \
91-I$(top_srcdir)/src/lib/ecore_evas \ 91-I$(top_srcdir)/src/lib/ecore_evas \
92-I$(top_srcdir)/src/lib/evas \
92-I$(top_builddir)/src/lib/eina \ 93-I$(top_builddir)/src/lib/eina \
93-I$(top_builddir)/src/lib/eo \ 94-I$(top_builddir)/src/lib/eo \
94-I$(top_builddir)/src/lib/ecore \ 95-I$(top_builddir)/src/lib/ecore \
@@ -101,7 +102,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
101@EFL_COV_CFLAGS@ \ 102@EFL_COV_CFLAGS@ \
102@IBUS_CFLAGS@ 103@IBUS_CFLAGS@
103modules_ecore_immodules_ibus_ibus_la_LIBADD = \ 104modules_ecore_immodules_ibus_ibus_la_LIBADD = \
104lib/ecore_imf/libecore_evas.la \ 105lib/ecore_evas/libecore_evas.la \
105lib/ecore_imf/libecore_imf.la \ 106lib/ecore_imf/libecore_imf.la \
106lib/ecore_x/libecore_x.la \ 107lib/ecore_x/libecore_x.la \
107lib/ecore/libecore.la \ 108lib/ecore/libecore.la \
@@ -129,6 +130,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
129-I$(top_srcdir)/src/lib/ecore_x \ 130-I$(top_srcdir)/src/lib/ecore_x \
130-I$(top_srcdir)/src/lib/ecore_imf \ 131-I$(top_srcdir)/src/lib/ecore_imf \
131-I$(top_srcdir)/src/lib/ecore_evas \ 132-I$(top_srcdir)/src/lib/ecore_evas \
133-I$(top_srcdir)/src/lib/evas \
132-I$(top_builddir)/src/lib/eina \ 134-I$(top_builddir)/src/lib/eina \
133-I$(top_builddir)/src/lib/eo \ 135-I$(top_builddir)/src/lib/eo \
134-I$(top_builddir)/src/lib/ecore \ 136-I$(top_builddir)/src/lib/ecore \
@@ -141,7 +143,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
141@EFL_COV_CFLAGS@ \ 143@EFL_COV_CFLAGS@ \
142@SCIM_CFLAGS@ 144@SCIM_CFLAGS@
143modules_ecore_immodules_scim_scim_la_LIBADD = \ 145modules_ecore_immodules_scim_scim_la_LIBADD = \
144lib/ecore_imf/libecore_evas.la \ 146lib/ecore_evas/libecore_evas.la \
145lib/ecore_imf/libecore_imf.la \ 147lib/ecore_imf/libecore_imf.la \
146lib/ecore_x/libecore_x.la \ 148lib/ecore_x/libecore_x.la \
147lib/ecore/libecore.la \ 149lib/ecore/libecore.la \
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.cpp b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
index d4d20b161a..5d48bf2a17 100644
--- a/src/modules/ecore/immodules/scim/scim_imcontext.cpp
+++ b/src/modules/ecore/immodules/scim/scim_imcontext.cpp
@@ -1455,7 +1455,7 @@ isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
1455 1455
1456/* Panel Slot functions */ 1456/* Panel Slot functions */
1457static void 1457static void
1458panel_slot_reload_config(int context __UNUSED__) 1458panel_slot_reload_config(int context EINA_UNUSED)
1459{ 1459{
1460 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1460 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
1461 _config->reload(); 1461 _config->reload();
@@ -1834,7 +1834,7 @@ panel_finalize(void)
1834} 1834}
1835 1835
1836static Eina_Bool 1836static Eina_Bool
1837panel_iochannel_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler) 1837panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
1838{ 1838{
1839 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1839 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
1840 1840
@@ -2753,7 +2753,7 @@ slot_update_property(IMEngineInstanceBase *si,
2753} 2753}
2754 2754
2755static void 2755static void
2756slot_beep(IMEngineInstanceBase *si __UNUSED__) 2756slot_beep(IMEngineInstanceBase *si EINA_UNUSED)
2757{ 2757{
2758 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2758 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
2759} 2759}
@@ -2886,7 +2886,7 @@ reload_config_callback(const ConfigPointer &config)
2886} 2886}
2887 2887
2888static void 2888static void
2889fallback_commit_string_cb(IMEngineInstanceBase *si __UNUSED__, 2889fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED,
2890 const WideString &str) 2890 const WideString &str)
2891{ 2891{
2892 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2892 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";