Index: Makefile.am =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/Makefile.am,v retrieving revision 1.3 diff -u -p -r1.3 Makefile.am --- Makefile.am 19 Jan 2006 08:40:43 -0000 1.3 +++ Makefile.am 14 May 2007 07:57:51 -0000 @@ -15,8 +15,8 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -SUBDIRS = intl po m4 src data +SUBDIRS = po src data -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = EXTRA_DIST = config.rpath Index: bootstrap =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/bootstrap,v retrieving revision 1.1 diff -u -p -r1.1 bootstrap --- bootstrap 22 Nov 2004 07:57:00 -0000 1.1 +++ bootstrap 14 May 2007 07:57:51 -0000 @@ -20,6 +20,7 @@ #! /bin/sh set -x +glib-gettextize --force aclocal -I m4 autoheader libtoolize -c --automake Index: configure.ac =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/configure.ac,v retrieving revision 1.27.2.2 diff -u -p -r1.27.2.2 configure.ac --- configure.ac 17 Apr 2007 06:41:38 -0000 1.27.2.2 +++ configure.ac 14 May 2007 07:57:51 -0000 @@ -25,7 +25,9 @@ AM_CONFIG_HEADER(config.h) # Init gettext ALL_LINGUAS="ja" -AM_GNU_GETTEXT +AM_GLIB_GNU_GETTEXT +LTLIBINTL= +AC_SUBST(LTLIBINTL) GETTEXT_PACKAGE=scim-anthy AC_SUBST(GETTEXT_PACKAGE) Index: po/ja.po =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/po/ja.po,v retrieving revision 1.96.2.2 diff -u -p -r1.96.2.2 ja.po --- po/ja.po 29 Apr 2007 01:44:10 -0000 1.96.2.2 +++ po/ja.po 14 May 2007 07:57:53 -0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: anthy\n" -"Report-Msgid-Bugs-To: ashie@homa.ne.jp\n" -"POT-Creation-Date: 2007-04-19 10:35+0900\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-05-14 15:56+0800\n" "PO-Revision-Date: 2006-02-14 10:50+0900\n" "Last-Translator: Takuro Ashie \n" "Language-Team: Japanese \n" @@ -362,6 +362,7 @@ msgstr "背景色" msgid "Both color" msgstr "文字色/背景色" +#. category menu #: src/scim_anthy_setup.cpp:803 msgid "_Group:" msgstr "グループ(_G):" @@ -386,10 +387,12 @@ msgstr "キーバインド" msgid "Description" msgstr "説明" +#. for key bind theme #: src/scim_anthy_setup.cpp:912 msgid "Key bindings _theme:" msgstr "キーバインドテーマ:" +#. edit button #: src/scim_anthy_setup.cpp:926 msgid "_Choose keys..." msgstr "キーを設定...(_C)" @@ -473,6 +476,7 @@ msgstr "外観" msgid "About" msgstr "情報" +#. create menu items #: src/scim_anthy_setup.cpp:1403 src/scim_anthy_setup_romaji.cpp:255 #: src/scim_anthy_setup_kana.cpp:413 src/scim_anthy_setup_kana.cpp:480 msgid "User defined" Index: src/scim_anthy_action.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_action.cpp,v retrieving revision 1.7 diff -u -p -r1.7 scim_anthy_action.cpp --- src/scim_anthy_action.cpp 13 Jul 2006 07:41:51 -0000 1.7 +++ src/scim_anthy_action.cpp 14 May 2007 07:57:53 -0000 @@ -21,6 +21,7 @@ #include #endif +#include "scim_anthy_imengine.h" #include "scim_anthy_action.h" #include "scim_anthy_utils.h" Index: src/scim_anthy_conversion.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_conversion.cpp,v retrieving revision 1.40.2.1 diff -u -p -r1.40.2.1 scim_anthy_conversion.cpp --- src/scim_anthy_conversion.cpp 30 Oct 2006 05:13:09 -0000 1.40.2.1 +++ src/scim_anthy_conversion.cpp 14 May 2007 07:57:53 -0000 @@ -387,10 +387,11 @@ Conversion::get_segment_string (int segm } else { int len = anthy_get_segment (m_anthy_context, real_seg, cand, NULL, 0); if (len > 0) { - char buf[len + 1]; + char *buf = new char[len + 1]; anthy_get_segment (m_anthy_context, real_seg, cand, buf, len + 1); buf[len] = '\0'; m_iconv.convert (segment_str, buf, len); + delete[] buf; } } @@ -534,7 +535,7 @@ Conversion::get_candidates (CommonLookup if (len <= 0) continue; - char buf[len + 1]; + char *buf = new char[len + 1]; anthy_get_prediction (m_anthy_context, i, buf, len + 1); buf[len] = '\0'; @@ -542,6 +543,7 @@ Conversion::get_candidates (CommonLookup m_iconv.convert (cand, buf); table.append_candidate (cand); + delete[] buf; } #endif /* HAS_ANTHY_PREDICTION */ } else if (is_converting ()) { @@ -571,7 +573,7 @@ Conversion::get_candidates (CommonLookup if (len <= 0) continue; - char buf[len + 1]; + char *buf = new char[len + 1]; anthy_get_segment (m_anthy_context, real_segment_id, i, buf, len + 1); @@ -579,6 +581,7 @@ Conversion::get_candidates (CommonLookup m_iconv.convert (cand_wide, buf, len); table.append_candidate (cand_wide); + delete[] buf; } table.set_cursor_pos (get_selected_candidate ()); @@ -800,12 +803,13 @@ Conversion::get_prediction_string (int c if (len <= 0) return WideString (); - char buf[len + 1]; + char *buf = new char[len + 1]; anthy_get_prediction (m_anthy_context, candidate_id, buf, len + 1); buf[len] = '\0'; WideString cand; m_iconv.convert (cand, buf); + delete[] buf; return cand; #else /* HAS_ANTHY_PREDICTION */ Index: src/scim_anthy_table_editor.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_table_editor.cpp,v retrieving revision 1.7 diff -u -p -r1.7 scim_anthy_table_editor.cpp --- src/scim_anthy_table_editor.cpp 4 Oct 2005 10:28:51 -0000 1.7 +++ src/scim_anthy_table_editor.cpp 14 May 2007 07:57:54 -0000 @@ -205,7 +205,7 @@ scim_anthy_table_editor_set_columns (Sci if (n_cols <= 0) return; - GType types[n_cols]; + GType *types = new GType[n_cols]; for (gint i = 0; i < n_cols; i++) types[i] = G_TYPE_STRING; @@ -276,6 +276,7 @@ scim_anthy_table_editor_set_columns (Sci // clean g_object_unref (store); + delete[] types; } const char * Index: src/scim_anthy_utils.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_utils.cpp,v retrieving revision 1.8.4.1 diff -u -p -r1.8.4.1 scim_anthy_utils.cpp --- src/scim_anthy_utils.cpp 6 Jan 2007 00:54:06 -0000 1.8.4.1 +++ src/scim_anthy_utils.cpp 14 May 2007 07:57:54 -0000 @@ -275,7 +275,7 @@ util_launch_program (const char *command /* split string */ unsigned int len = strlen (command); - char tmp[len + 1]; + char *tmp = new char[len + 1]; strncpy (tmp, command, len); tmp[len] = '\0'; @@ -295,7 +295,7 @@ util_launch_program (const char *command if (array.size () <= 0) return; array.push_back (NULL); - char *args[array.size()]; + char **args = new char*[array.size()]; for (unsigned int i = 0; i < array.size (); i++) args[i] = array[i]; @@ -324,6 +324,9 @@ util_launch_program (const char *command int status; waitpid(child_pid, &status, 0); } + + delete[] tmp; + delete[] args; } }