Attachment 618201 Details for Bug 861156 – 0001-Make-it-work-for-input-methods-like-latn-post-latn-p.patch

[patch] 0001-Make-it-work-for-input-methods-like-latn-post-latn-p.patch

0001-Make-it-work-for-input-methods-like-latn-post-latn-p.patch (text/plain), 3.21 KB, created by Mike FABIAN on 2012-09-27 16:26:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike FABIAN

Created: 2012-09-27 16:26:34 UTC

Size: 3.21 KB

patch

obsolete

>From 8b3cb2dfccfdc1f3ef5208d91809f0f449e29450 Mon Sep 17 00:00:00 2001
>From: Mike FABIAN <mfabian@redhat.com>
>Date: Thu, 27 Sep 2012 10:52:35 +0200
>Subject: [PATCH] Make it work for input methods like latn-post, latn-pre, ...
>
>---
> modules/transliteratorm17n.c | 26 +++++++++++++++++------
> tests/basic.c                | 50 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 70 insertions(+), 6 deletions(-)
>
>diff --git a/modules/transliteratorm17n.c b/modules/transliteratorm17n.c
>index 7152e40..40e251a 100644
>--- a/modules/transliteratorm17n.c
>+++ b/modules/transliteratorm17n.c
>@@ -182,14 +182,28 @@ initable_init (GInitable *initable,
> 		"name", &name,
> 		NULL);
> 
>-  strv = g_strsplit (name, "-", 2);
>-  g_return_val_if_fail (g_strv_length (strv) == 2, FALSE);
>+  if (0 == strcmp(name, "latn-post") ||
>+      0 == strcmp(name, "latn-pre") ||
>+      0 == strcmp(name, "rfc1345") ||
>+      0 == strcmp(name, "syrc-phonetic") ||
>+      0 == strcmp(name, "unicode"))
>+    {
>+      m17n->im = minput_open_im (msymbol ("t"),
>+                                msymbol (name),
>+                                NULL);
>+    }
>+  else
>+    {
>+      strv = g_strsplit (name, "-", 2);
>+      g_return_val_if_fail (g_strv_length (strv) == 2, FALSE);
>+
>+      m17n->im = minput_open_im (msymbol (strv[0]),
>+                                msymbol (strv[1]),
>+                                NULL);
>+      g_strfreev (strv);
>+    }
> 
>-  m17n->im = minput_open_im (msymbol (strv[0]),
>-			     msymbol (strv[1]),
>-			     NULL);
>   g_free (name);
>-  g_strfreev (strv);
> 
>   if (m17n->im)
>     {
>diff --git a/tests/basic.c b/tests/basic.c
>index 5e60848..6db0cb0 100644
>--- a/tests/basic.c
>+++ b/tests/basic.c
>@@ -52,6 +52,8 @@ basic (void)
>   error = NULL;
>   transliterator = translit_transliterator_get ("m17n", "hi-inscript",
> 						&error);
>+  g_assert_no_error (error);
>+
>   if (transliterator)
>     {
>       gchar *output;
>@@ -72,6 +74,54 @@ basic (void)
>     }
> 
>   error = NULL;
>+  transliterator = translit_transliterator_get ("m17n", "da-post",
>+						&error);
>+  g_assert_no_error (error);
>+
>+  if (transliterator)
>+    {
>+      gchar *output;
>+      guint endpos;
>+      GError *error;
>+
>+      error = NULL;
>+      output = translit_transliterator_transliterate (transliterator,
>+						      "oeaae'aeaaa",
>+						      &endpos,
>+						      &error);
>+      g_assert_no_error (error);
>+      g_assert_cmpint (endpos, ==, 11);
>+      g_assert_cmpstr (output, ==, "Ã¸Ã¥Ã©Ã¦aa");
>+
>+      g_free (output);
>+      g_object_unref (transliterator);
>+    }
>+
>+  error = NULL;
>+  transliterator = translit_transliterator_get ("m17n", "latn-post",
>+						&error);
>+  g_assert_no_error (error);
>+
>+  if (transliterator)
>+    {
>+      gchar *output;
>+      guint endpos;
>+      GError *error;
>+
>+      error = NULL;
>+      output = translit_transliterator_transliterate (transliterator,
>+						      "a/a//",
>+						      &endpos,
>+						      &error);
>+      g_assert_no_error (error);
>+      g_assert_cmpint (endpos, ==, 5);
>+      g_assert_cmpstr (output, ==, "Ã¥a/");
>+
>+      g_free (output);
>+      g_object_unref (transliterator);
>+    }
>+
>+  error = NULL;
>   transliterator = translit_transliterator_get ("icu", "Latin-Katakana",
> 						&error);
>   if (transliterator)
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 861156: 618201