callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a memory initialization error for selecting input style (#103549).

Browse Source 
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
	initialization error for selecting input style (#103549).
This commit is contained in:
Hidetoshi Tajima
2003-01-29 22:45:51 +00:00
parent 68eabf07e0
commit 7c4b9f61d4
6 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jan 29 14:11:21 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
initialization error for selecting input style (#103549).
Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com> Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkkeyuni.c (get_decimal_char): Make the * gdk/gdkkeyuni.c (get_decimal_char): Make the

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Wed Jan 29 14:11:21 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
initialization error for selecting input style (#103549).
Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com> Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkkeyuni.c (get_decimal_char): Make the * gdk/gdkkeyuni.c (get_decimal_char): Make the

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Wed Jan 29 14:11:21 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
initialization error for selecting input style (#103549).
Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com> Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkkeyuni.c (get_decimal_char): Make the * gdk/gdkkeyuni.c (get_decimal_char): Make the

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Wed Jan 29 14:11:21 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
initialization error for selecting input style (#103549).
Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com> Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkkeyuni.c (get_decimal_char): Make the * gdk/gdkkeyuni.c (get_decimal_char): Make the

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Wed Jan 29 14:11:21 2003 Hidetoshi Tajima <hidetoshi.tajima@sun.com>
* modules/input/gtkimcontextxim.c (choose_better_style): fix a memory
initialization error for selecting input style (#103549).
Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com> Wed Jan 29 17:02:41 2003 Owen Taylor <otaylor@redhat.com>
* gdk/gdkkeyuni.c (get_decimal_char): Make the * gdk/gdkkeyuni.c (get_decimal_char): Make the

9
modules/input/gtkimcontextxim.c
View File

@ -151,6 +151,8 @@ choose_better_style (XIMStyle style1, XIMStyle style2)
return (s1 == XIMPreeditArea) ? style1 : style2; return (s1 == XIMPreeditArea) ? style1 : style2;
else if (u & XIMPreeditNothing) else if (u & XIMPreeditNothing)
return (s1 == XIMPreeditNothing) ? style1 : style2; return (s1 == XIMPreeditNothing) ? style1 : style2;
else if (u & XIMPreeditNone)
return (s1 == XIMPreeditNone) ? style1 : style2;
} else { } else {
s1 = style1 & STATUS_MASK; s1 = style1 & STATUS_MASK;
s2 = style2 & STATUS_MASK; s2 = style2 & STATUS_MASK;
@ -223,6 +225,7 @@ setup_styles (GtkXIMInfo *info)
XIMStyles *xim_styles = info->xim_styles; XIMStyles *xim_styles = info->xim_styles;
settings_preference = info->status_style_setting|info->preedit_style_setting; settings_preference = info->status_style_setting|info->preedit_style_setting;
info->style = 0;
if (xim_styles) if (xim_styles)
{ {
for (i = 0; i < xim_styles->count_styles; i++) for (i = 0; i < xim_styles->count_styles; i++)
@ -237,6 +240,8 @@ setup_styles (GtkXIMInfo *info)
xim_styles->supported_styles[i]); xim_styles->supported_styles[i]);
} }
} }
if (info->style == 0)
info->style = XIMPreeditNothing | XIMStatusNothing;
} }
static void static void
@ -1084,6 +1089,8 @@ get_ic_real (GtkIMContextXIM *context_xim)
name1 = XNPreeditAttributes; name1 = XNPreeditAttributes;
list1 = set_preedit_callback (context_xim); list1 = set_preedit_callback (context_xim);
} }
else if ((context_xim->im_info->style & PREEDIT_MASK) == XIMPreeditNone)
im_style |= XIMPreeditNone;
else else
im_style |= XIMPreeditNothing; im_style |= XIMPreeditNothing;
@ -1101,6 +1108,8 @@ get_ic_real (GtkIMContextXIM *context_xim)
list2 = set_status_callback (context_xim); list2 = set_status_callback (context_xim);
} }
} }
else if ((context_xim->im_info->style & STATUS_MASK) == XIMStatusNone)
im_style |= XIMStatusNone;
else else
im_style |= XIMStatusNothing; im_style |= XIMStatusNothing;