Author: ek.kato
Date: Fri Nov 14 03:47:11 2008
New Revision: 5625
Modified:
branches/1.5/gtk/caret-state-indicator.c
branches/1.5/gtk/gtk-im-uim.c
branches/1.5/gtk/uim-eb.c
branches/1.5/scm/japanese-azik.scm
Log:
* Merge r5610:5613 from trunk.
Modified: branches/1.5/gtk/caret-state-indicator.c
==============================================================================
--- branches/1.5/gtk/caret-state-indicator.c (original)
+++ branches/1.5/gtk/caret-state-indicator.c Fri Nov 14 03:47:11 2008
@@ -89,6 +89,20 @@
return FALSE;
}
+static gint
+caret_state_indicator_destroy_cb(GtkWidget *window)
+{
+ GList *label_list, *frame_list;
+
+ label_list = g_object_get_data(G_OBJECT(window), "labels");
+ frame_list = g_object_get_data(G_OBJECT(window), "frames");
+
+ g_list_free(label_list);
+ g_list_free(frame_list);
+
+ return FALSE;
+}
+
GtkWidget *
caret_state_indicator_new(void)
{
@@ -110,6 +124,9 @@
g_signal_connect(window, "expose_event",
G_CALLBACK(caret_state_indicator_paint_window),
+ NULL);
+ g_signal_connect(window, "destroy",
+ G_CALLBACK(caret_state_indicator_destroy_cb),
NULL);
gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
Modified: branches/1.5/gtk/gtk-im-uim.c
==============================================================================
--- branches/1.5/gtk/gtk-im-uim.c (original)
+++ branches/1.5/gtk/gtk-im-uim.c Fri Nov 14 03:47:11 2008
@@ -1347,11 +1347,8 @@
IMUIMContext *uic = IM_UIM_CONTEXT(ic);
if (w) {
- g_object_ref(w);
uic->win = w;
} else {
- if (uic->win)
- g_object_unref(uic->win);
uic->win = NULL;
}
update_client_widget(uic);
Modified: branches/1.5/gtk/uim-eb.c
==============================================================================
--- branches/1.5/gtk/uim-eb.c (original)
+++ branches/1.5/gtk/uim-eb.c Fri Nov 14 03:47:11 2008
@@ -109,6 +109,7 @@
eb_ref_count--;
if (eb_ref_count == 0)
eb_finalize_library();
+ free(ueb);
}
Modified: branches/1.5/scm/japanese-azik.scm
==============================================================================
--- branches/1.5/scm/japanese-azik.scm (original)
+++ branches/1.5/scm/japanese-azik.scm Fri Nov 14 03:47:11 2008
@@ -152,6 +152,7 @@
((("g" "y" "z"). ())(("��" "��" "����") ("��" "��" "��")
("��" "��" "��")))
((("g" "z"). ())(("��" "��" "����") ("��" "��" "��")))
((("h" "d"). ())(("��" "��" "��") ("��" "��" "��")))
+ ((("h" "f"). ())("��" "��" "��"))
((("h" "g" "a"). ())(("��" "��" "��") ("��" "��" "��")))
((("h" "g" "d"). ())(("��" "��" "��") ("��" "��" "��")
("��" "��" "��")))
((("h" "g" "e"). ())(("��" "��" "��") ("��" "��" "��")))
@@ -241,6 +242,7 @@
((("l" "i"). ())("��" "��" "��"))
((("l" "o"). ())("��" "��" "��"))
((("l" "u"). ())("��" "��" "��"))
+ ((("l" "w" "a"). ())("��" "��" "��"))
((("l" "y" "a"). ())("��" "��" "��"))
((("l" "y" "e"). ())(("��" "��" "��") ("��" "��" "��")))
((("l" "y" "i"). ())(("��" "��" "��") ("��" "��" "��")))
@@ -284,6 +286,7 @@
((("n"). ())("��" "��" "��"))
((("n" "b"). ())(("��" "��" "��") ("��" "��" "�ʎ�")))
((("n" "d"). ())(("��" "��" "��") ("��" "��" "��")))
+ ((("n" "f"). ())("��" "��" "��"))
((("n" "g" "a"). ())(("��" "��" "��") ("��" "��" "��")))
((("n" "g" "d"). ())(("��" "��" "��") ("��" "��" "��")
("��" "��" "��")))
((("n" "g" "e"). ())(("��" "��" "��") ("��" "��" "��")))
@@ -317,6 +320,7 @@
((("n" "y" "z"). ())(("��" "��" "��") ("��" "��" "��")
("��" "��" "��")))
((("n" "z"). ())(("��" "��" "��") ("��" "��" "��")))
((("p" "d"). ())(("��" "��" "�͎�") ("��" "��" "��")))
+ ((("p" "f"). ())(("��" "��" "�Ύ�") ("��" "��" "��")))
((("p" "g" "a"). ())(("��" "��" "�ˎ�") ("��" "��" "��")))
((("p" "g" "d"). ())(("��" "��" "�ˎ�") ("��" "��" "��")
("��" "��" "��")))
((("p" "g" "e"). ())(("��" "��" "�ˎ�") ("��" "��" "��")))
@@ -436,6 +440,7 @@
((("t" "y" "z"). ())(("��" "��" "��") ("��" "��" "��")
("��" "��" "��")))
((("t" "z"). ())(("��" "��" "��") ("��" "��" "��")))
((("w" "d"). ())(("��" "��" "��") ("��" "��" "��") ("��" "��" "��")))
+ ((("w" "f"). ())(("��" "��" "��") ("��" "��" "��")))
((("w" "k"). ())(("��" "��" "��") ("��" "��" "��") ("��" "��" "��")))
((("w" "l"). ())(("��" "��" "��") ("��" "��" "��") ("��" "��" "��")))
((("w" "n"). ())(("��" "��" "��") ("��" "��" "��")))
@@ -472,6 +477,7 @@
((("x" "w"). ())(("��" "��" "��") ("��" "��" "��") ("��" "��" "��")))
((("x" "z"). ())(("��" "��" "��") ("��" "��" "��") ("��" "��" "��")))
((("y" "e"). ())(("��" "��" "��") ("��" "��" "��")))
+ ((("y" "f"). ())("��" "��" "��"))
((("y" "h"). ())(("��" "��" "��") ("��" "��" "��")))
((("y" "i"). ())("��" "��" "��"))
((("y" "j"). ())(("��" "��" "��") ("��" "��" "��")))
