Fix memory intilization error caused by my previous checkin. #94908 a

	* modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
	intilization error caused by my previous checkin.
	#94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)

diff --git a/ChangeLog b/ChangeLog
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2c9216b501243300a273dd01790dac704c0f9cba..d0083cf47b8bd0bf8b583db1491732bf2dd04e6a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Oct  4 15:05:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * modules/input/gtkimcontextxim.c (get_ic_real): Fix memory
+       intilization error caused by my previous checkin.
+       #94908 a patch from famao@momonga-linux.org (Motonobu Ichimura)
+       
 Fri Oct  4 17:13:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c: Improve checks on public entry points,

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index a8a6d196c1695077e8df7d1b509a9fbc8ed94fe5..611dac3d4623e1cbb85ca81b55dba682e74d3a78 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -1064,7 +1064,7 @@ get_ic_real (GtkIMContextXIM *context_xim)
        * (bugzilla #81759)
        */
       gulong mask = 0;
-      XGetICValues (context_xim->ic,
+      XGetICValues (xic,
                    XNFilterEvents, &mask,
                    NULL);
       context_xim->filter_key_release = (mask & KeyReleaseMask);