Takuro Ashie
makei****@users*****
2006年 11月 28日 (火) 13:26:46 JST
Index: uim-tomoe-gtk/src/Makefile.am
diff -u uim-tomoe-gtk/src/Makefile.am:1.3 uim-tomoe-gtk/src/Makefile.am:1.4
--- uim-tomoe-gtk/src/Makefile.am:1.3 Thu Oct 6 13:13:07 2005
+++ uim-tomoe-gtk/src/Makefile.am Tue Nov 28 13:26:46 2006
@@ -7,7 +7,8 @@
INCLUDES = \
$(GTK_CFLAGS) \
- $(LIBTOMOE_GTK_CFLAGS) \
+ $(TOMOE_CFLAGS) \
+ $(TOMOEGTK_CFLAGS) \
$(UIM_CFLAGS)
bin_PROGRAMS = uim-tomoe-gtk
@@ -19,5 +20,6 @@
uim_tomoe_gtk_LDADD = \
$(INTLLIBS) \
$(GTK_LIBS) \
- $(LIBTOMOE_GTK_LIBS) \
+ $(TOMOE_LIBS) \
+ $(TOMOEGTK_LIBS) \
$(UIM_LIBS)
Index: uim-tomoe-gtk/src/uim-tomoe-gtk.c
diff -u uim-tomoe-gtk/src/uim-tomoe-gtk.c:1.12 uim-tomoe-gtk/src/uim-tomoe-gtk.c:1.13
--- uim-tomoe-gtk/src/uim-tomoe-gtk.c:1.12 Thu Nov 16 15:14:08 2006
+++ uim-tomoe-gtk/src/uim-tomoe-gtk.c Tue Nov 28 13:26:46 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: uim-tomoe-gtk.c,v 1.12 2006/11/16 06:14:08 ikezoe Exp $
+ * $Id: uim-tomoe-gtk.c,v 1.13 2006/11/28 04:26:46 makeinu Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -45,7 +45,7 @@
if (!ch) return;
- str = tomoe_char_get_code (ch);
+ str = tomoe_char_get_utf8 (ch);
if (!str) return;
g_string_append (tmp, str);
@@ -118,8 +118,9 @@
/* add hooks */
tomoe = TOMOE_WINDOW (window);
- page = TOMOE_STROKE_SEARCH (tomoe->handwriting_page);
- g_signal_connect (G_OBJECT (page->candidates_view), "selected",
+ page = TOMOE_STROKE_SEARCH (tomoe_window_get_handwriting_page (tomoe));
+ g_signal_connect (G_OBJECT (tomoe_stroke_search_get_candidates_view (page)),
+ "selected",
G_CALLBACK (char_clicked_cb),
(gpointer) tomoe);