[ibus-m17n/f14/master] Update to 1.3.1-4.

[Daiki Ueno]

commit 0fff2dd6f37e6898fa1b514ebc970b6a81e3956f
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Oct 5 12:32:14 2010 +0900

    Update to 1.3.1-4.

 ...m17n-shift-altgr.patch => ibus-m17n-altgr.patch |   41 +++++++++-----------
 ibus-m17n.spec                                     |    8 +++-
 2 files changed, 24 insertions(+), 25 deletions(-)
---
diff --git a/ibus-m17n-shift-altgr.patch b/ibus-m17n-altgr.patch
similarity index 54%
rename from ibus-m17n-shift-altgr.patch
rename to ibus-m17n-altgr.patch
index fd162e0..6af8203 100644
--- a/ibus-m17n-shift-altgr.patch
+++ b/ibus-m17n-altgr.patch
@@ -1,20 +1,14 @@
-From 8b6dc1102e7bad1016e1e504f22e9c9d65eb36bb Mon Sep 17 00:00:00 2001
+From b4f997685fd1df5e9d4e1f41e59e490e39d5b9d9 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <ueno at unixuser.org>
 Date: Wed, 29 Sep 2010 18:14:50 +0900
-Subject: [PATCH] Treat AltGr+Shift different from AltGr.
+Subject: [PATCH] Simplify AltGr handling.
 
-According to Indic users, there should be 4 shift levels of keyboard symbols:
-(1) no modifier keys are hold
-(2) Shift key is pressed
-(3) AltGr key is pressed
-(4) both Shift and AltGr keys are pressed
-Previously ibus-m17n only recognizes 1-3.  This patch enables the 4th case.
 ---
- src/engine.c |   21 ++++++++++++++-------
- 1 files changed, 14 insertions(+), 7 deletions(-)
+ src/engine.c |   24 +++++++++++++++---------
+ 1 files changed, 15 insertions(+), 9 deletions(-)
 
 diff --git a/src/engine.c b/src/engine.c
-index dbd00fc..e8e017b 100644
+index dbd00fc..1dbcf34 100644
 --- a/src/engine.c
 +++ b/src/engine.c
 @@ -424,9 +424,9 @@ ibus_m17n_engine_commit_string (IBusM17NEngine *m17n,
@@ -30,7 +24,7 @@ index dbd00fc..e8e017b 100644
  
     KeyCode altgr = XKeysymToKeycode (display, XK_ISO_Level3_Shift);
     XModifierKeymap *mods = XGetModifierMapping (display);
-@@ -448,20 +448,27 @@ ibus_m17n_key_event_to_symbol (guint keycode,
+@@ -448,20 +448,26 @@ ibus_m17n_key_event_to_symbol (guint keycode,
      MSymbol mkeysym = Mnil;
      guint mask = 0;
      IBusKeymap *keymap;
@@ -40,18 +34,19 @@ index dbd00fc..e8e017b 100644
          return Mnil;
      }
  
-+    /* Here KEYVAL is already translated by AltGr/Shift modifiers.
-+       Get the keyval in one level lower to handle AltGr/Shift
-+       modifiers correctly. */
-     keymap = ibus_keymap_get ("us");
+-    keymap = ibus_keymap_get ("us");
 -    base_keyval = ibus_keymap_lookup_keysym (keymap, keycode, 0);
-+    keyval = ibus_keymap_lookup_keysym (keymap, keycode,
-+                                        (modifiers & IBUS_MOD5_MASK) ?
-+                                        (modifiers & ~IBUS_MOD5_MASK) :
-+                                        (modifiers & IBUS_SHIFT_MASK) ?
-+                                        (modifiers & ~IBUS_SHIFT_MASK) :
-+                                        modifiers);
-     g_object_unref (keymap);
+-    g_object_unref (keymap);
++    /* Here, keyval is already translated by IBUS_MOD5_MASK.  Obtain
++       the untranslated keyval from the underlying keymap and
++       represent the translated keyval as the form "G-<untranslated
++       keyval>", which m17n-lib accepts. */
++    if (modifiers & IBUS_MOD5_MASK) {
++        keymap = ibus_keymap_get ("us");
++        keyval = ibus_keymap_lookup_keysym (keymap, keycode,
++                                            modifiers & ~IBUS_MOD5_MASK);
++        g_object_unref (keymap);
++    }
  
      keysym = g_string_new ("");
  
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 2c82261..622cb42 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.1
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -11,7 +11,7 @@ Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
 Patch0:     ibus-m17n-iok.patch
 Patch1:	    ibus-m17n-surrounding-text.patch
-Patch2:	    ibus-m17n-shift-altgr.patch
+Patch2:	    ibus-m17n-altgr.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Tue Oct  5 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-4
+- Remove Shift+AltGr patch; apply a simplified AltGr patch.
+- Fix bug 639963 - SHIFT switch is not working in layouts as expected.
+
 * Fri Oct  1 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-3
 - Apply a patch to handle Shift+AltGr.
 - Update surrounding-text patch.