Include "." and ".." in the list of entries; they are needed for correct

[~andy/gtk] / gtk / gtkimcontextsimple.c

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 6ca2529d71ce45d877461c5699d823fe5d0cb57c..6976f31624d260f13ba8ac7269f1cc7a5390afe6 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -21,14 +21,13 @@
 
 #include <gdk/gdkkeysyms.h>
 #include "gtkaccelgroup.h"
-#include "gtksignal.h"
 #include "gtkimcontextsimple.h"
 
 typedef struct _GtkComposeTable GtkComposeTable;
 
 struct _GtkComposeTable 
 {
-  guint16 *data;
+  const guint16 *data;
   gint max_seq_len;
   gint n_seqs;
 };
@@ -56,7 +55,7 @@ struct _GtkComposeTable
  * that depend on the locale or selected input method. 
  */
 
-static guint16 gtk_compose_seqs[] = {
+static const guint16 gtk_compose_seqs[] = {
   GDK_dead_grave,      GDK_space,      0,      0,      0,      0x0060, /* GRAVE_ACCENT */
   GDK_dead_grave,      GDK_A,  0,      0,      0,      0x00C0, /* LATIN_CAPITAL_LETTER_A_WITH_GRAVE */
   GDK_dead_grave,      GDK_E,  0,      0,      0,      0x00C8, /* LATIN_CAPITAL_LETTER_E_WITH_GRAVE */
@@ -181,6 +180,12 @@ static guint16 gtk_compose_seqs[] = {
   GDK_dead_abovering,  GDK_a,  0,      0,      0,      0x00E5, /* LATIN_SMALL_LETTER_A_WITH_RING_ABOVE */
   GDK_dead_abovering,  GDK_u,  0,      0,      0,      0x016F, /* LATIN_SMALL_LETTER_U_WITH_RING_ABOVE */
   GDK_dead_abovering,  GDK_dead_abovering,     0,      0,      0,      0x02DA, /* RING_ABOVE */
+  GDK_dead_doubleacute,        GDK_space,      0,      0,      0,      0x02DD, /* DOUBLE_ACUTE_ACCENT */
+  GDK_dead_doubleacute,        GDK_O,  0,      0,      0,      0x0150, /* LATIN_CAPITAL_LETTER_O_WITH_DOUBLE_ACUTE */
+  GDK_dead_doubleacute,        GDK_U,  0,      0,      0,      0x0170, /* LATIN_CAPITAL_LETTER_U_WITH_DOUBLE_ACUTE */
+  GDK_dead_doubleacute,        GDK_o,  0,      0,      0,      0x0151, /* LATIN_SMALL_LETTER_O_WITH_DOUBLE_ACUTE */
+  GDK_dead_doubleacute,        GDK_u,  0,      0,      0,      0x0171, /* LATIN_SMALL_LETTER_U_WITH_DOUBLE_ACUTE */
+  GDK_dead_doubleacute,        GDK_dead_doubleacute,   0,      0,      0,      0x02DD, /* DOUBLE_ACUTE_ACCENT */
   GDK_dead_caron,      GDK_space,      0,      0,      0,      0x02C7, /* CARON */
   GDK_dead_caron,      GDK_C,  0,      0,      0,      0x010C, /* LATIN_CAPITAL_LETTER_C_WITH_CARON */
   GDK_dead_caron,      GDK_D,  0,      0,      0,      0x010E, /* LATIN_CAPITAL_LETTER_D_WITH_CARON */
@@ -827,7 +832,7 @@ static const GtkComposeTable gtk_compose_table = {
   G_N_ELEMENTS (gtk_compose_seqs) / 6
 };
 
-guint16 gtk_compose_ignore[] = {
+static const guint16 gtk_compose_ignore[] = {
   GDK_Shift_L,
   GDK_Shift_R,
   GDK_Control_L,
@@ -858,10 +863,10 @@ static void     gtk_im_context_simple_get_preedit_string (GtkIMContext
 
 static GObjectClass *parent_class;
 
-GtkType
+GType
 gtk_im_context_simple_get_type (void)
 {
-  static GtkType im_context_simple_type = 0;
+  static GType im_context_simple_type = 0;
 
   if (!im_context_simple_type)
     {
@@ -878,9 +883,9 @@ gtk_im_context_simple_get_type (void)
         (GInstanceInitFunc) gtk_im_context_simple_init,
       };
       
-      im_context_simple_type = g_type_register_static (GTK_TYPE_IM_CONTEXT,
-                                                      "GtkIMContextSimple",
-                                                      &im_context_simple_info, 0);
+      im_context_simple_type =
+       g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMContextSimple",
+                               &im_context_simple_info, 0);
     }
 
   return im_context_simple_type;
@@ -931,7 +936,7 @@ gtk_im_context_simple_finalize (GObject *obj)
 GtkIMContext *
 gtk_im_context_simple_new (void)
 {
-  return GTK_IM_CONTEXT (g_object_new (GTK_TYPE_IM_CONTEXT_SIMPLE, NULL));
+  return g_object_new (GTK_TYPE_IM_CONTEXT_SIMPLE, NULL);
 }
 
 static void
@@ -1104,7 +1109,7 @@ check_hex (GtkIMContextSimple *context_simple,
   context_simple->tentative_match = n;
   context_simple->tentative_match_len = n_compose;
   
-  g_signal_emit_by_name (context_simple, "preedit-changed");
+  g_signal_emit_by_name (context_simple, "preedit_changed");
   
   return TRUE;
 }