[uim-commit] r3122 - trunk/gtk

[ekato at freedesktop.org]

Author: ekato
Date: 2006-02-18 08:14:25 -0800 (Sat, 18 Feb 2006)
New Revision: 3122

Modified:
   trunk/gtk/gtk-im-uim.c
Log:
* gtk/gtk-im-uim.c (im_module_create) : Obsolete prop_label.
(im_uim_finalize) : Call im_uim_set_client_window() with NULL to
  cleanup signals.


Modified: trunk/gtk/gtk-im-uim.c
===================================================================
--- trunk/gtk/gtk-im-uim.c	2006-02-18 14:23:44 UTC (rev 3121)
+++ trunk/gtk/gtk-im-uim.c	2006-02-18 16:14:25 UTC (rev 3122)
@@ -608,6 +608,7 @@
   g_string_free(prop_list, TRUE);
 }
 
+#if 0
 static void
 update_prop_label_cb(void *ptr, const char *str)
 {
@@ -639,6 +640,7 @@
     gtk_widget_show_all(uic->caret_state_indicator);
   }
 }
+#endif
 
 static void
 cand_activate_cb(void *ptr, int nr, int display_limit)
@@ -1179,8 +1181,9 @@
 im_uim_finalize(GObject *obj)
 {
   IMUIMContext *uic = IM_UIM_CONTEXT(obj);
-  /* im_uim_set_client_window(GTK_IM_CONTEXT(uic), NULL); */
 
+  im_uim_set_client_window(GTK_IM_CONTEXT(uic), NULL);
+
   uic->next->prev = uic->prev;
   uic->prev->next = uic->next;
 
@@ -1191,6 +1194,7 @@
 #endif
     uic->cwin = NULL;
   }
+
   if (uic->caret_state_indicator) {
     guint tag = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(uic->caret_state_indicator), "timeout-tag"));
     if (tag > 0)
@@ -1207,14 +1211,6 @@
     gtk_widget_destroy(uic->preedit_window);
     uic->preedit_window = NULL;
   }
-#if IM_UIM_USE_TOPLEVEL
-  if (uic->widget) {
-    g_signal_handlers_disconnect_by_func(uic->widget,
-		    (gpointer)on_client_widget_hierarchy_changed, uic);
-    g_signal_handlers_disconnect_by_func(uic->widget,
-		    (gpointer)on_client_widget_grab_notify, uic);
-  }
-#endif
 
   uim_release_context(uic->uc);
 
@@ -1278,7 +1274,7 @@
 
   uim_set_preedit_cb(uic->uc, clear_cb, pushback_cb, update_cb);
   uim_set_prop_list_update_cb(uic->uc, update_prop_list_cb);
-  uim_set_prop_label_update_cb(uic->uc, update_prop_label_cb);
+  /* uim_set_prop_label_update_cb(uic->uc, update_prop_label_cb); */
   uim_set_candidate_selector_cb(uic->uc, cand_activate_cb, cand_select_cb,
 				cand_shift_page_cb, cand_deactivate_cb);
   uim_set_configuration_changed_cb(uic->uc, configuration_changed_cb);