Hello community, here is the log from the commit of package fcitx-m17n for openSUSE:Factory checked in at 2013-11-08 08:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-m17n (Old) and /work/SRC/openSUSE:Factory/.fcitx-m17n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-m17n" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-m17n/fcitx-m17n.changes 2013-07-08 13:35:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-m17n.new/fcitx-m17n.changes 2013-11-08 08:34:51.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 6 15:44:44 UTC 2013 - [email protected] + +- update version 0.2.2 + * fix problem under non-utf8 locale + * fix key translation with two modifier + +------------------------------------------------------------------- Old: ---- fcitx-m17n-0.2.1.tar.xz New: ---- fcitx-m17n-0.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-m17n.spec ++++++ --- /var/tmp/diff_new_pack.S6d67A/_old 2013-11-08 08:34:51.000000000 +0100 +++ /var/tmp/diff_new_pack.S6d67A/_new 2013-11-08 08:34:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: fcitx-m17n -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: M17N engine for fcitx License: GPL-2.0+ ++++++ fcitx-m17n-0.2.1.tar.xz -> fcitx-m17n-0.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-m17n-0.2.1/im/fcitx-m17n.c new/fcitx-m17n-0.2.2/im/fcitx-m17n.c --- old/fcitx-m17n-0.2.1/im/fcitx-m17n.c 2013-06-03 20:02:57.000000000 +0200 +++ new/fcitx-m17n-0.2.2/im/fcitx-m17n.c 2013-11-03 12:33:26.000000000 +0100 @@ -342,29 +342,32 @@ mask |= state & (FcitxKeyState_UsedMask); - const char* prefix = ""; + // we have 7 possible below, then 20 is long enough (7 x 2 = 14 < 20) + char prefix[20] = ""; - if (mask & FcitxKeyState_Hyper) { - prefix = "H-"; + // and we use reverse order here comparing with other implementation since strcat is append. + // I don't know if it matters, but it's just to make sure it works. + if (mask & FcitxKeyState_Shift) { + strcat(prefix, "S-"); } - if (mask & FcitxKeyState_Super) { - prefix = "s-"; + if (mask & FcitxKeyState_Ctrl) { + strcat(prefix, "C-"); } - // This is mysterious. - xiaq - if (mask & FcitxKeyState_ScrollLock) { - prefix = "G-"; + if (mask & FcitxKeyState_Meta) { + strcat(prefix, "M-"); } if (mask & FcitxKeyState_Alt) { - prefix = "A-"; + strcat(prefix, "A-"); } - if (mask & FcitxKeyState_Meta) { - prefix = "M-"; + // This is mysterious. - xiaq + if (mask & FcitxKeyState_ScrollLock) { + strcat(prefix, "G-"); } - if (mask & FcitxKeyState_Ctrl) { - prefix = "C-"; + if (mask & FcitxKeyState_Super) { + strcat(prefix, "s-"); } - if (mask & FcitxKeyState_Shift) { - prefix = "S-"; + if (mask & FcitxKeyState_Hyper) { + strcat(prefix, "H-"); } char* keystr; @@ -410,7 +413,6 @@ FcitxIRV FcitxM17NDoInputInternal(IM* im, FcitxKeySym sym, unsigned state) { FcitxInstance* inst = im->owner->owner; - FcitxInputState* is = FcitxInstanceGetInputState(inst); FcitxInputContext* ic = FcitxInstanceGetCurrentIC(inst); MSymbol msym = KeySymToSymbol(sym, state); @@ -507,6 +509,7 @@ void *FcitxM17NCreate(FcitxInstance* inst) { bindtextdomain(TEXTDOMAIN, LOCALEDIR); + bind_textdomain_codeset(TEXTDOMAIN, "UTF-8"); Addon* addon = (Addon*) fcitx_utils_malloc0(sizeof(Addon)); addon->owner = inst; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-m17n-0.2.1/po/ja.po new/fcitx-m17n-0.2.2/po/ja.po --- old/fcitx-m17n-0.2.1/po/ja.po 2013-06-03 20:02:57.000000000 +0200 +++ new/fcitx-m17n-0.2.2/po/ja.po 2013-11-03 12:33:26.000000000 +0100 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# しろう <>, 2013 +# しろう, 2013 +# しろう, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-04-25 00:02-0400\n" -"PO-Revision-Date: 2013-04-14 08:32+0000\n" -"Last-Translator: しろう <>\n" +"POT-Creation-Date: 2013-08-07 12:02-0400\n" +"PO-Revision-Date: 2013-08-07 14:55+0000\n" +"Last-Translator: しろう\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"; "ja/)\n" "Language: ja\n" @@ -45,6 +46,8 @@ "Enable deprecated input method provided M17N, usually this means something " "better is already out (Need restart)" msgstr "" +"M17Nによって提供されていた廃止予定の入力メソッを有効化します。廃止予定とは、" +"今はもっといい入力メソッドがあることを通常意味します(再起動が必要)" #: im/i18nname.c:14 msgid "Hanja" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-m17n-0.2.1/po/zh_CN.po new/fcitx-m17n-0.2.2/po/zh_CN.po --- old/fcitx-m17n-0.2.1/po/zh_CN.po 2013-06-03 20:02:57.000000000 +0200 +++ new/fcitx-m17n-0.2.2/po/zh_CN.po 2013-11-03 12:33:26.000000000 +0100 @@ -8,17 +8,18 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-04-25 00:02-0400\n" -"PO-Revision-Date: 2013-01-22 10:00+0000\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-04-29 10:04+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" -"Language-Team: Chinese (China) <[email protected]>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/"; +"language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: im/fcitx-m17n.c:574 +#: im/fcitx-m17n.c:575 #, c-format msgid "%s (M17N)" msgstr "%s (M17N)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
