diff --git a/ChangeLog b/ChangeLog
index d6fcb729202815408ceb1078cfe9f4f9cca87afa..1c7b2030dcd7fac9f2e6b9b46e3042669c56478d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
+	prematurely unregister callbacks. 
+
 	* NEWS: Updates
 
 2005-06-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d6fcb729202815408ceb1078cfe9f4f9cca87afa..1c7b2030dcd7fac9f2e6b9b46e3042669c56478d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
+	prematurely unregister callbacks. 
+
 	* NEWS: Updates
 
 2005-06-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d6fcb729202815408ceb1078cfe9f4f9cca87afa..1c7b2030dcd7fac9f2e6b9b46e3042669c56478d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't
+	prematurely unregister callbacks. 
+
 	* NEWS: Updates
 
 2005-06-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index c210a2c52ea957bda8389a274814d2382ff6973c..40c8d31c177a677eae5f5ca91401ec8aa5e18f9d 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) 
     {
       if (context_xim->im_info->reconnecting)
 	{