Fix a C99ism

svn path=/trunk/; revision=21398

diff --git a/ChangeLog b/ChangeLog
index fd82a4f3f87f69074e734cef167cf3b35d386765..e64c1ffb003a7526f1aa76e62f43e8e1f8fe2cd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-16  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 552001 – gtkimcontextsimple.c: variable is declared at middle of
+       block
+
+       * gtk/gtkimcontextsimple.c: Fix a C99ism, pointed out by Kazuki
+       Iwamoto.
+
 2008-09-13  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkmain.c: Don't use the deprectated

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index bb49d21db7b06c925c7491e8f7fe8a339e87a409..459bdd7ea7521fc4aefd61378be927b64e5675cb 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -485,10 +485,11 @@ check_algorithmically (GtkIMContextSimple    *context_simple,
        */
       if (check_normalize_nfc (combination_buffer, n_compose))
         {
+          gunichar value;
          combination_utf8 = g_ucs4_to_utf8 (combination_buffer, -1, NULL, NULL, NULL);
           nfc = g_utf8_normalize (combination_utf8, -1, G_NORMALIZE_NFC);
 
-          gunichar value = g_utf8_get_char (nfc);
+          value = g_utf8_get_char (nfc);
           gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value);
           context_simple->compose_buffer[0] = 0;