---
 gtk/compose.c              |    1 +
 gtk/uim-cand-win-gtk.c     |    2 +-
 gtk/uim-cand-win-tbl-gtk.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

--- a/gtk/compose.c
+++ b/gtk/compose.c
@@ -767,6 +767,7 @@
 im_uim_release_compose_tree()
 {
     FreeComposeTree(g_tree);
+    g_tree = NULL;
 }
 
 static int
--- a/gtk/uim-cand-win-gtk.c
+++ b/gtk/uim-cand-win-gtk.c
@@ -107,7 +107,7 @@
 GType
 uim_cand_win_gtk_register_type(GTypeModule *module)
 {
-  if (!cand_win_type)
+  //if (!cand_win_type)
     cand_win_type = g_type_module_register_type(module,
 						GTK_TYPE_WINDOW,
 						"UIMCandWinGtk",
--- a/gtk/uim-cand-win-tbl-gtk.c
+++ b/gtk/uim-cand-win-tbl-gtk.c
@@ -136,7 +136,7 @@
 GType
 uim_cand_win_tbl_gtk_register_type(GTypeModule *module)
 {
-  if (!cand_win_tbl_type)
+  //if (!cand_win_tbl_type)
     cand_win_tbl_type = g_type_module_register_type(module,
 						UIM_TYPE_CAND_WIN_GTK,
 						"UIMCandWinTblGtk",