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)

ChangeLog

+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: 

ChangeLog.pre-2-10

+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: 

ChangeLog.pre-2-4

+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: 

ChangeLog.pre-2-6

+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: 

ChangeLog.pre-2-8

+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: 

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

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;