[uim-commit] r1499 - branches/0.4/gtk

[tkng at freedesktop.org]

Author: tkng
Date: 2005-09-14 20:34:24 -0700 (Wed, 14 Sep 2005)
New Revision: 1499

Modified:
   branches/0.4/gtk/caret-state-indicator.c
   branches/0.4/gtk/gtk-im-uim.c
Log:
* gtk/gtk-im-uim.c: Port r1498 from trunk.
* gtk/caret-state-indicator.c: Ditto.



Modified: branches/0.4/gtk/caret-state-indicator.c
===================================================================
--- branches/0.4/gtk/caret-state-indicator.c	2005-09-15 03:25:36 UTC (rev 1498)
+++ branches/0.4/gtk/caret-state-indicator.c	2005-09-15 03:34:24 UTC (rev 1499)
@@ -92,7 +92,8 @@
 void
 caret_state_indicator_set_timeout(GtkWidget *window, gint timeout)
 {
-  g_timeout_add(timeout, caret_state_indicator_timeout, (gpointer)window);
+  guint tag = g_timeout_add(timeout, caret_state_indicator_timeout, (gpointer)window);
+  g_object_set_data(G_OBJECT(window), "timeout-tag", GINT_TO_POINTER(tag));
 }
 
 static gint

Modified: branches/0.4/gtk/gtk-im-uim.c
===================================================================
--- branches/0.4/gtk/gtk-im-uim.c	2005-09-15 03:25:36 UTC (rev 1498)
+++ branches/0.4/gtk/gtk-im-uim.c	2005-09-15 03:34:24 UTC (rev 1499)
@@ -666,6 +666,8 @@
     uic->cwin = NULL;
   }
   if (uic->caret_state_indicator) {
+    guint tag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(uic->caret_state_indicator), "timeout-tag"));
+    g_source_remove(tag);
     gtk_widget_destroy(uic->caret_state_indicator);
     uic->caret_state_indicator = NULL;
   }