gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)

	* gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle):
	* modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
	gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)

diff --git a/ChangeLog b/ChangeLog
index 90c8eca0f0fae161c0b52038007c304c90aee98c..13a98ae1338333891bd7df927bc0cc30c0830696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 21 13:19:05 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle): 
+       * modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
+       gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
+
 Wed May 21 12:10:25 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 
        * gtk/gtkimcontextsimple.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 90c8eca0f0fae161c0b52038007c304c90aee98c..13a98ae1338333891bd7df927bc0cc30c0830696 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed May 21 13:19:05 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle): 
+       * modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
+       gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
+
 Wed May 21 12:10:25 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 
        * gtk/gtkimcontextsimple.c: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 90c8eca0f0fae161c0b52038007c304c90aee98c..13a98ae1338333891bd7df927bc0cc30c0830696 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed May 21 13:19:05 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle): 
+       * modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
+       gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
+
 Wed May 21 12:10:25 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 
        * gtk/gtkimcontextsimple.c: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 90c8eca0f0fae161c0b52038007c304c90aee98c..13a98ae1338333891bd7df927bc0cc30c0830696 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed May 21 13:19:05 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle): 
+       * modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
+       gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
+
 Wed May 21 12:10:25 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 
        * gtk/gtkimcontextsimple.c: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 90c8eca0f0fae161c0b52038007c304c90aee98c..13a98ae1338333891bd7df927bc0cc30c0830696 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed May 21 13:19:05 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtkenums.h (enum GtkIMPreeditStyle, GtkIMStatusStyle): 
+       * modules/input/gtkimcontextxim.c (preedit_style_change, status_style_change):
+       gtk settings for XIMPreeditNone and XIMStatusNone. (#105909)
+
 Wed May 21 12:10:25 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 
        * gtk/gtkimcontextsimple.c: 

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index d558dbfa4273aeb741ea923ebc80c027724b13bc..9a9fe3601fbfd4c79c0d32b2306029d90a75dfc4 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -431,13 +431,15 @@ typedef enum
 typedef enum
 {
   GTK_IM_PREEDIT_NOTHING,
-  GTK_IM_PREEDIT_CALLBACK
+  GTK_IM_PREEDIT_CALLBACK,
+  GTK_IM_PREEDIT_NONE
 } GtkIMPreeditStyle;
 
 typedef enum
 {
   GTK_IM_STATUS_NOTHING,
-  GTK_IM_STATUS_CALLBACK
+  GTK_IM_STATUS_CALLBACK,
+  GTK_IM_STATUS_NONE
 } GtkIMStatusStyle;
 
 #ifdef __cplusplus

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index f1bfede1197d73671fcada81b16ad820736d86e3..953f8916bdca3115eeba5986aab4eba798adca4f 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -190,6 +190,8 @@ status_style_change (GtkXIMInfo *info)
     info->status_style_setting = XIMStatusCallbacks;
   else if (status_style == GTK_IM_STATUS_NOTHING)
     info->status_style_setting = XIMStatusNothing;
+  else if (status_style == GTK_IM_STATUS_NONE)
+    info->status_style_setting = XIMStatusNone;
   else
     return;
 
@@ -209,6 +211,8 @@ preedit_style_change (GtkXIMInfo *info)
     info->preedit_style_setting = XIMPreeditCallbacks;
   else if (preedit_style == GTK_IM_PREEDIT_NOTHING)
     info->preedit_style_setting = XIMPreeditNothing;
+  else if (preedit_style == GTK_IM_PREEDIT_NONE)
+    info->preedit_style_setting = XIMPreeditNone;
   else
     return;