diff options
| author | Choe Hwanjin <choe.hwanjin@gmail.com> | 2009-06-20 21:37:30 +0900 |
|---|---|---|
| committer | Choe Hwanjin <choe.hwanjin@gmail.com> | 2009-06-20 21:37:30 +0900 |
| commit | 5acb8229d28851816c6361c9d10dd050be653a12 (patch) | |
| tree | 1032d9d2d596ffc7b8203da2dd09e6901cf16eb3 | |
| parent | c483f257b0fa99307621b713e7c06ec6ed2001a3 (diff) | |
| parent | db93bf174b5058e6ad24a1a38d9e506732aa986e (diff) | |
| download | ibus-hangul-1.2.0.20090617.tar.gz | |
Merge branch 'master' of git://github.com/phuang/ibus-hangul1.2.0.20090617
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/engine.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 609871f..74dc23a 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # if not 1, append datestamp to the version number. m4_define([ibus_released], [0]) m4_define([ibus_major_version], [1]) -m4_define([ibus_minor_version], [1]) +m4_define([ibus_minor_version], [2]) m4_define([ibus_micro_version], [0]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -49,10 +49,12 @@ AC_ISC_POSIX AC_HEADER_STDC AM_PROG_LIBTOOL -# check libhangul +# check ibus PKG_CHECK_MODULES(IBUS, [ - ibus-1.0 + ibus-1.0 >= 1.2.0 ]) + +# check libhangul PKG_CHECK_MODULES(HANGUL, [ libhangul >= 0.0.9 ]) diff --git a/src/Makefile.am b/src/Makefile.am index cda4b12..d016424 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,7 +59,6 @@ component_DATA = \ componentdir = @datadir@/ibus/component EXTRA_DIST = \ - hangul.xml.in \ $(NULL) CLEANFILES = \ diff --git a/src/engine.c b/src/engine.c index 506566d..a31ee1e 100644 --- a/src/engine.c +++ b/src/engine.c @@ -36,8 +36,9 @@ static void ibus_hangul_engine_destroy (IBusHangulEngine *hangul); static gboolean ibus_hangul_engine_process_key_event (IBusEngine *engine, - guint keyval, - guint modifiers); + guint keyval, + guint keycode, + guint modifiers); static void ibus_hangul_engine_focus_in (IBusEngine *engine); static void ibus_hangul_engine_focus_out (IBusEngine *engine); static void ibus_hangul_engine_reset (IBusEngine *engine); @@ -432,6 +433,7 @@ ibus_hangul_engine_process_candidate_key_event (IBusHangulEngine *hangul, static gboolean ibus_hangul_engine_process_key_event (IBusEngine *engine, guint keyval, + guint keycode, guint modifiers) { IBusHangulEngine *hangul = (IBusHangulEngine *) engine; |