Unset gtk-im-surrounding-info object data again. (Fix from Yao Zhang,

Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
        Unset gtk-im-surrounding-info object data again.
        (Fix from Yao Zhang, #86811)

diff --git a/ChangeLog b/ChangeLog
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eaefc5428787c7bd7d0b959bfcd0fdbbf2bb818c..290e57af3cd2365ea9aa712e67fc9fc0e7078d43 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jul 29 16:42:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.c (gtk_im_context_real_get_surrounding):
+       Unset gtk-im-surrounding-info object data again.
+       (Fix from Yao Zhang, #86811)
+
 Fri Jul 26 17:59:06 2002  Owen Taylor  <otaylor@redhat.com>
  
        * configure.in: Replace uses of grep \(A\|B\) ... with

diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 925021f907b4c5c18220acd6c4e5ca064e502252..5f1067b52896bab11e8bc848f718ab70fa56a442 100644 (file)
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -227,7 +227,10 @@ gtk_im_context_real_get_surrounding (GtkIMContext *context,
     }
 
   if (info_is_local)
-    g_free (info->text);
+    {
+      g_free (info->text);
+      g_object_set_data (G_OBJECT (context), "gtk-im-surrounding-info", NULL);
+    }
   
   return result;
 }