diff --git a/ChangeLog b/ChangeLog
index fd91ab3935..34e8dc0ce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd91ab3935..34e8dc0ce0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fd91ab3935..34e8dc0ce0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
+	Don't prematurely unregister callbacks.
+
 2005-06-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): 
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 4408c745b1..8b192e9738 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -565,7 +565,7 @@ gtk_im_context_xim_finalize (GObject *obj)
 
   context_xim->finalizing = TRUE;
 
-  if (context_xim->im_info) 
+  if (context_xim->im_info && !context_xim->im_info->ics->next) 
     {
       GdkDisplay *display;