[uim-commit] r629 - trunk/gtk

[makeinu at freedesktop.org]

Author: makeinu
Date: 2005-02-11 06:03:01 -0800 (Fri, 11 Feb 2005)
New Revision: 629

Modified:
   trunk/gtk/gtk-im-uim.c
Log:
* gtk/gtk-im-uim.c
  - (cand_deactivate_cb): Check uic->win before removing filter
    function.
  - (im_uim_finalize): minor fix.


Modified: trunk/gtk/gtk-im-uim.c
===================================================================
--- trunk/gtk/gtk-im-uim.c	2005-02-11 13:40:21 UTC (rev 628)
+++ trunk/gtk/gtk-im-uim.c	2005-02-11 14:03:01 UTC (rev 629)
@@ -645,12 +645,12 @@
 
   if (uic->menu) {
     gtk_widget_destroy(uic->menu);
+    uic->menu = NULL;
   }
   if (uic->cwin) {
     gtk_widget_destroy(GTK_WIDGET(uic->cwin));
     uic->cwin = NULL;
   }
-  uic->menu = NULL;
 
   uim_release_context(uic->uc);
 
@@ -838,10 +838,12 @@
   uic->cwin_is_active = FALSE;
 
   if (uic->cwin) {
+    gtk_widget_hide(GTK_WIDGET(uic->cwin));
+    uim_cand_win_gtk_clear_candidates(uic->cwin);
+  }
+  if (uic->win) {
     GdkWindow *toplevel;
 
-    gtk_widget_hide(GTK_WIDGET(uic->cwin));
-    uim_cand_win_gtk_clear_candidates(uic->cwin);
     toplevel = gdk_window_get_toplevel(uic->win);
     gdk_window_remove_filter(toplevel, toplevel_window_candidate_cb, uic);
   }