Set the IM context client window to NULL, not to the window that is about

Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
        context client  window to NULL, not to the window that
        is about to be destroyed. (#88231)

diff --git a/ChangeLog b/ChangeLog
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 066702c31ca413317845247ff7ac3dcca35bf62a..03c418c254977f4cce859b209b9eb1f79566dbd4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Sep 20 18:01:26 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
+       context client  window to NULL, not to the window that 
+       is about to be destroyed. (#88231)
+ 
 Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8879fb405e2902eb1f16f120816955dedc684d82..1da8138a470ad195bd423ac59dfede0a732b2740 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -999,7 +999,7 @@ gtk_entry_unrealize (GtkWidget *widget)
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkClipboard *clipboard;
 
-  gtk_im_context_set_client_window (entry->im_context, entry->text_area);
+  gtk_im_context_set_client_window (entry->im_context, NULL);
 
   clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY);
   if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (entry))