Was a bit false start.

This commit is contained in:
Takao Fujiwara 2010-11-18 13:34:29 +09:00
parent 08b90e8e95
commit bbf11357eb
2 changed files with 8 additions and 8 deletions

View File

@ -390,15 +390,15 @@ index 3ac853a..a34e930 100644
class EngineAbout(gtk.Dialog): class EngineAbout(gtk.Dialog):
def __init__(self, enginedesc): def __init__(self, enginedesc):
diff --git a/bus/inputcontext.c b/bus/inputcontext.c diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index ec72dd1..8af3ccb 100644 index ec72dd1..87fa162 100644
--- a/bus/inputcontext.c --- a/bus/inputcontext.c
+++ b/bus/inputcontext.c +++ b/bus/inputcontext.c
@@ -699,7 +699,7 @@ _ic_process_key_event (BusInputContext *context, @@ -698,7 +698,7 @@ _ic_process_key_event (BusInputContext *context,
if (G_UNLIKELY (!context->has_focus)) {
/* workaround: set focus if context does not have focus */ /* workaround: set focus if context does not have focus */
BusInputContext *focused_context = bus_ibus_impl_get_focused_input_context (BUS_DEFAULT_IBUS); BusInputContext *focused_context = bus_ibus_impl_get_focused_input_context (BUS_DEFAULT_IBUS);
if (context == NULL || - if (context == NULL ||
- focused_context->fake == TRUE || + if (focused_context == NULL ||
+ (focused_context != NULL && focused_context->fake == TRUE) || focused_context->fake == TRUE ||
context->fake == FALSE) { context->fake == FALSE) {
/* grab focus, if context is a real IC or current focused IC is fake */ /* grab focus, if context is a real IC or current focused IC is fake */
bus_input_context_focus_in (context);

View File

@ -12,7 +12,7 @@
Name: ibus Name: ibus
Version: 1.3.99.20101028 Version: 1.3.99.20101028
Release: 3%{?dist} Release: 4%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -310,7 +310,7 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Thu Nov 18 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101028-3 * Thu Nov 18 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101028-4
- Added ibus-652157-x11-ppc64.patch - Added ibus-652157-x11-ppc64.patch
Fixed Bug 652157 - Window position of ibus-x11 in ppc64 Fixed Bug 652157 - Window position of ibus-x11 in ppc64
- Added ibus-530711-preload-sys.patch - Added ibus-530711-preload-sys.patch