From 539ad89f76a7a06d8526434a8c408a49f63789a8 Mon Sep 17 00:00:00 2001 From: Hidetoshi Tajima Date: Wed, 21 May 2003 20:21:41 +0000 Subject: [PATCH] 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 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkenums.h | 6 ++++-- modules/input/gtkimcontextxim.c | 4 ++++ 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90c8eca0f..13a98ae13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 21 13:19:05 2003 Hidetoshi Tajima + + * 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 * gtk/gtkimcontextsimple.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 90c8eca0f..13a98ae13 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed May 21 13:19:05 2003 Hidetoshi Tajima + + * 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 * gtk/gtkimcontextsimple.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 90c8eca0f..13a98ae13 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed May 21 13:19:05 2003 Hidetoshi Tajima + + * 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 * gtk/gtkimcontextsimple.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 90c8eca0f..13a98ae13 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed May 21 13:19:05 2003 Hidetoshi Tajima + + * 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 * gtk/gtkimcontextsimple.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 90c8eca0f..13a98ae13 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed May 21 13:19:05 2003 Hidetoshi Tajima + + * 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 * gtk/gtkimcontextsimple.c: diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index d558dbfa4..9a9fe3601 100644 --- 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 f1bfede11..953f8916b 100644 --- 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; -- 2.43.2