[uim] r7083 committed - * Merge r7081, 7082 from trunk.

[codesite-noreply]

Revision: 7083
Author:   nogu.dev
Date:     Fri May 13 23:08:40 2011
Log:      * Merge r7081, 7082 from trunk.
http://code.google.com/p/uim/source/detail?r=7083
Modified:
 /branches/1.7/NEWS
 /branches/1.7/gtk/uim-cand-win-gtk.c

=======================================
--- /branches/1.7/NEWS  Wed May 11 21:57:00 2011
+++ /branches/1.7/NEWS  Fri May 13 23:08:40 2011
@@ -1,8 +1,11 @@
 Overview of changes from 1.7.0-alpha to 1.7.0
 =============================================
 * Fixes
-  - Fix sort order of Wubi86 and Zhengma tables in 1.7.0-alpha
-
+  - Generic IM
+    * Fix sort order of Wubi86 and Zhengma tables in 1.7.0-alpha
+
+  - GTK+3 bridge
+    * Avoid repeated change of subwindow size in some annotation text

 Overview of changes from 1.6.x to 1.7.0-alpha
 =============================================
=======================================
--- /branches/1.7/gtk/uim-cand-win-gtk.c        Sat Feb 12 04:49:42 2011
+++ /branches/1.7/gtk/uim-cand-win-gtk.c        Fri May 13 23:08:40 2011
@@ -900,7 +900,11 @@

   cwin->sub_window.text_view = text_view = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(text_view), FALSE);
+#if GTK_CHECK_VERSION(2, 90, 0)
+  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view),  
GTK_WRAP_WORD_CHAR);
+#else
   gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_view), GTK_WRAP_WORD);
+#endif
   gtk_widget_show(text_view);

   gtk_container_add(GTK_CONTAINER(scrwin), text_view);