| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732 |
- commit 92442c305096abf2773386ce67f24ceafa767e08
- Author: Hodong Kim <hodong@nimfsoft.com>
- Date: Tue Apr 28 23:40:19 2020 +0900
- 2020.04.28
- diff --git a/README b/README
- index 58c2691..4ec31ec 100644
- --- a/README
- +++ b/README
- @@ -17,7 +17,7 @@ Nimf provides:
- * Preedit window
- * Candidate
- * Client Modules:
- - * GTK+2, GTK+3, Qt4, Qt5
- + * GTK+2, GTK+3, Qt5
- * Settings tool to configure the Nimf:
- * nimf-settings
- * Development files:
- @@ -131,10 +131,10 @@ Compiling and installing
- sudo yum install epel-release
-
- sudo yum install gcc-c++ libtool glib2-devel pkgconfig intltool \
- - gtk3-devel gtk2-devel qt4-devel qt5-qtbase-devel \
- - qt5-qtbase-private-devel libappindicator-gtk3-devel librsvg2-tools \
- - google-noto-cjk-fonts libhangul-devel anthy-devel anthy \
- - libxkbcommon-devel wayland-devel libxklavier-devel gtk-doc
- + gtk3-devel gtk2-devel qt5-qtbase-devel qt5-qtbase-private-devel \
- + libappindicator-gtk3-devel librsvg2-tools google-noto-cjk-fonts \
- + libhangul-devel anthy-devel anthy libxkbcommon-devel wayland-devel \
- + libxklavier-devel gtk-doc
-
- rpmbuild -bb nimf-master/nimf.spec
- ls -R rpmbuild/RPMS/
- @@ -215,7 +215,7 @@ Debugging
- tail -f /var/log/daemon.log # or /var/log/syslog
-
- export GTK_IM_MODULE="nimf"
- - export QT4_IM_MODULE="nimf"
- + export QT4_IM_MODULE="xim"
- export QT_IM_MODULE="nimf"
- export XMODIFIERS="@im=nimf"
- export G_MESSAGES_DEBUG=nimf
- diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
- index 638ce58..c28c8c7 100644
- --- a/archlinux/PKGBUILD
- +++ b/archlinux/PKGBUILD
- @@ -1,7 +1,7 @@
- #
- # PKGBUILD
- # This file is part of Nimf.
- -#
- +# Author: Hodong Kim
- # Unlike other files in the Nimf project,
- # this PKGBUILD file is in the public domain.
-
- @@ -13,12 +13,12 @@ arch=('any')
- url="https://gitlab.com/nimf-i18n/nimf"
- license=('LGPL3')
- makedepends=('binutils' 'autoconf' 'automake' 'gcc' 'make' 'glib2' 'intltool'
- - 'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3' 'librsvg'
- + 'gtk3' 'gtk2' 'qt5-base' 'libappindicator-gtk3' 'librsvg'
- 'noto-fonts-cjk' 'libhangul' 'anthy' 'librime' 'libxkbcommon'
- 'wayland' 'libxklavier' 'm17n-lib' 'm17n-db' 'gtk-doc')
- -depends=('glib2' 'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3'
- - 'libhangul' 'anthy' 'librime' 'libxkbcommon' 'wayland' 'libxklavier'
- - 'm17n-lib' 'm17n-db')
- +depends=('glib2' 'gtk3' 'gtk2' 'qt5-base' 'libappindicator-gtk3' 'libhangul'
- + 'anthy' 'librime' 'libxkbcommon' 'wayland' 'libxklavier' 'm17n-lib'
- + 'm17n-db')
- optdepends=('brise: Rime schema repository'
- 'noto-fonts-cjk: Google Noto CJK fonts')
- source=("https://gitlab.com/nimf-i18n/nimf/-/archive/master/nimf-master.tar.bz2")
- diff --git a/bin/nimf/nimf.c b/bin/nimf/nimf.c
- index 0404c09..d2a6cc4 100644
- --- a/bin/nimf/nimf.c
- +++ b/bin/nimf/nimf.c
- @@ -3,7 +3,7 @@
- * nimf.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -33,13 +33,14 @@
- #include <syslog.h>
- #include <errno.h>
- #include <glib-unix.h>
- +#include "nimf-utils-private.h"
-
- static gchar *
- nimf_get_nimf_path ()
- {
- g_debug (G_STRLOC ": %s", G_STRFUNC);
-
- - return g_strconcat (g_get_user_runtime_dir (), "/nimf", NULL);
- + return g_strdup_printf ("/run/user/%u/nimf", nimf_get_loginuid ());
- }
-
- static gboolean
- @@ -66,7 +67,7 @@ nimf_get_lock_path ()
- {
- g_debug (G_STRLOC ": %s", G_STRFUNC);
-
- - return g_strconcat (g_get_user_runtime_dir (), "/nimf/lock.pid", NULL);
- + return g_strdup_printf ("/run/user/%u/nimf/lock.pid", nimf_get_loginuid ());
- }
-
- static int
- diff --git a/configure.ac b/configure.ac
- index a969a44..69bbc8d 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
-
- -AC_INIT(nimf, 2019.08.14)
- +AC_INIT(nimf, 2020.04.28)
-
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([m4])
- @@ -113,13 +113,9 @@ AS_IF([test "x$enable_nimf_anthy" != "xno" -a "x$HAVE_ANTHY_DIC" != "xyes"],
- AM_CONDITIONAL([ENABLE_NIMF_ANTHY], [test "x$enable_nimf_anthy" != "xno"])
-
- dnl ***************************************************************************
- -dnl im-nimf-qt4 im-nimf-qt5
- +dnl im-nimf-qt5
- dnl ***************************************************************************
-
- -PKG_CHECK_MODULES(IM_NIMF_QT4_DEPS, [QtGui], [],
- - [AC_MSG_ERROR([No package 'QtGui' found.
- - If you are using Debian, please install 'libqt4-dev'.])])
- -
- PKG_CHECK_MODULES(IM_NIMF_QT5_DEPS, [Qt5Core Qt5Gui Qt5Widgets], [],
- [AC_MSG_ERROR([Package requirements (Qt5Core Qt5Gui Qt5Widgets) were not met:
- If you are using Debian, please install 'qtbase5-dev'.])])
- @@ -310,7 +306,6 @@ AC_OUTPUT([
- modules/Makefile
- modules/clients/Makefile
- modules/clients/gtk/Makefile
- - modules/clients/qt4/Makefile
- modules/clients/qt5/Makefile
- modules/engines/Makefile
- modules/engines/nimf-anthy/Makefile
- diff --git a/data/im-config/23_nimf.rc b/data/im-config/23_nimf.rc
- index 2063e51..e18a1af 100644
- --- a/data/im-config/23_nimf.rc
- +++ b/data/im-config/23_nimf.rc
- @@ -5,7 +5,7 @@ fi
- if [ "$IM_CONFIG_PHASE" = 1 ]; then
- XMODIFIERS="@im=nimf"
- GTK_IM_MODULE=nimf
- - QT4_IM_MODULE=nimf
- + QT4_IM_MODULE=xim
- QT_IM_MODULE=nimf
- CLUTTER_IM_MODULE=xim
- fi
- diff --git a/data/nimf.conf b/data/nimf.conf
- index 05be33a..a495e94 100644
- --- a/data/nimf.conf
- +++ b/data/nimf.conf
- @@ -1,4 +1,4 @@
- GTK_IM_MODULE=nimf
- -QT4_IM_MODULE=nimf
- +QT4_IM_MODULE=xim
- QT_IM_MODULE=nimf
- XMODIFIERS=@im=nimf
- diff --git a/debian/changelog b/debian/changelog
- index f147500..dcfa464 100644
- --- a/debian/changelog
- +++ b/debian/changelog
- @@ -1,3 +1,13 @@
- +nimf (2020.04.28) stable; urgency=medium
- +
- + * Fixed auto-reordering
- + * Fixed errors when typing Hangul with the Dvorak layout.
- + * Fixed wrong path. This prevents nimf from running more than once.
- + Don't use g_get_user_runtime_dir()
- + * Fix an error on compiling im-nimf.c for gtk2
- +
- + -- Hodong Kim <nimfsoft@gmail.com> Tue, 28 Apr 2020 22:14:14 +0900
- +
- nimf (2019.08.14) stable; urgency=medium
-
- * Updated README
- diff --git a/debian/control b/debian/control
- index af19791..e4d38a7 100644
- --- a/debian/control
- +++ b/debian/control
- @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
- libgtk-3-dev,
- libgtk-3-bin,
- libgtk2.0-dev,
- - libqt4-dev,
- qtbase5-dev,
- qtbase5-private-dev,
- libappindicator3-dev,
- diff --git a/debian/nimf.install b/debian/nimf.install
- index 4800152..9315aee 100644
- --- a/debian/nimf.install
- +++ b/debian/nimf.install
- @@ -5,7 +5,6 @@ usr/lib/*/gtk-2.0
- usr/lib/*/gtk-3.0
- usr/lib/*/nimf/modules/libnimf-system-keyboard.so
- usr/lib/*/nimf/modules/services
- -usr/lib/*/qt4
- usr/lib/*/qt5
- usr/share/applications
- usr/share/glib-2.0/schemas/org.nimf.clients.*
- diff --git a/libnimf/nimf-im.c b/libnimf/nimf-im.c
- index ca8485b..8b78064 100644
- --- a/libnimf/nimf-im.c
- +++ b/libnimf/nimf-im.c
- @@ -3,7 +3,7 @@
- * nimf-im.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -20,14 +20,12 @@
- */
-
- #include "nimf-im.h"
- -#include <string.h>
- #include "nimf-marshalers-private.h"
- #include "nimf-message-private.h"
- -#include <errno.h>
- #include <glib/gstdio.h>
- #include <gio/gunixsocketaddress.h>
- #include "nimf-utils.h"
- -#include <stdlib.h>
- +#include "nimf-utils-private.h"
-
- enum {
- PREEDIT_START,
- @@ -59,31 +57,11 @@ struct _NimfIMPrivate
-
- guint16 id;
- GFileMonitor *monitor;
- - uid_t uid;
- gboolean created;
- };
-
- G_DEFINE_TYPE_WITH_PRIVATE (NimfIM, nimf_im, G_TYPE_OBJECT);
-
- -static uid_t
- -get_login_uid (void)
- -{
- - gchar *nptr;
- - gsize length;
- - uid_t uid;
- -
- - if (!g_file_get_contents ("/proc/self/loginuid", &nptr, &length, NULL))
- - return -1;
- -
- - errno = 0;
- - uid = strtol (nptr, NULL, 10);
- -
- - if (errno)
- - return -1;
- - else
- - return uid;
- -}
- -
- static gboolean
- nimf_im_is_connected ()
- {
- @@ -283,7 +261,7 @@ nimf_im_connect (NimfIM *im)
- {
- if (g_stat (nimf_im_socket_path, &info) == 0)
- {
- - if (im->priv->uid == info.st_uid)
- + if (nimf_get_loginuid () == info.st_uid)
- {
- if (g_socket_connect (nimf_im_socket, address, NULL, &error))
- {
- @@ -616,9 +594,6 @@ nimf_im_init (NimfIM *im)
- static guint16 next_id = 0;
- guint16 id;
-
- - if ((im->priv->uid = get_login_uid ()) == (uid_t) -1)
- - im->priv->uid = getuid ();
- -
- if (!nimf_im_socket_path)
- nimf_im_socket_path = nimf_get_socket_path ();
-
- diff --git a/libnimf/nimf-utils-private.h b/libnimf/nimf-utils-private.h
- index eacb64f..a59ccf4 100644
- --- a/libnimf/nimf-utils-private.h
- +++ b/libnimf/nimf-utils-private.h
- @@ -3,7 +3,7 @@
- * nimf-utils-private.h
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -28,6 +28,8 @@ G_BEGIN_DECLS
-
- gboolean gnome_is_running (void);
- gboolean gnome_xkb_is_available (void);
- +uid_t nimf_get_loginuid (void);
- +
- G_END_DECLS
-
- #endif /* __NIMF_UTILS_PRIVATE_H__ */
- diff --git a/libnimf/nimf-utils.c b/libnimf/nimf-utils.c
- index 9717ecc..9738fab 100644
- --- a/libnimf/nimf-utils.c
- +++ b/libnimf/nimf-utils.c
- @@ -3,7 +3,7 @@
- * nimf-utils.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -22,6 +22,7 @@
- #include "nimf-utils.h"
- #include "nimf-enum-types-private.h"
- #include <gio/gio.h>
- +#include <errno.h>
-
- /**
- * SECTION:nimf-utils
- @@ -45,6 +46,33 @@ nimf_keyval_to_keysym_name (guint keyval)
- return enum_value ? enum_value->value_nick : NULL;
- }
-
- +uid_t
- +nimf_get_loginuid (void)
- +{
- + gchar *loginuid;
- + static uid_t uid = -1;
- +
- + if (uid == (uid_t) -1)
- + {
- + g_file_get_contents ("/proc/self/loginuid", &loginuid, NULL, NULL);
- +
- + if (loginuid)
- + {
- + errno = 0;
- + uid = strtol (loginuid, NULL, 10);
- +
- + g_free (loginuid);
- +
- + if (!errno)
- + return uid;
- + }
- +
- + uid = getuid ();
- + }
- +
- + return uid;
- +}
- +
- /**
- * nimf_get_socket_path:
- *
- @@ -55,7 +83,7 @@ nimf_get_socket_path ()
- {
- g_debug (G_STRLOC ": %s", G_STRFUNC);
-
- - return g_strconcat (g_get_user_runtime_dir (), "/nimf/socket", NULL);
- + return g_strdup_printf ("/run/user/%u/nimf/socket", nimf_get_loginuid ());
- }
-
- /* private */
- diff --git a/modules/clients/Makefile.am b/modules/clients/Makefile.am
- index 8957aac..3cb9a22 100644
- --- a/modules/clients/Makefile.am
- +++ b/modules/clients/Makefile.am
- @@ -1,3 +1,3 @@
- -SUBDIRS = gtk qt4 qt5
- +SUBDIRS = gtk qt5
-
- DISTCLEANFILES = Makefile.in
- diff --git a/modules/clients/gtk/Makefile.am b/modules/clients/gtk/Makefile.am
- index f7752e2..6d1ca56 100644
- --- a/modules/clients/gtk/Makefile.am
- +++ b/modules/clients/gtk/Makefile.am
- @@ -22,7 +22,8 @@ gtk2_im_moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
- gtk2_im_module_LTLIBRARIES = im-nimf-gtk2.la
-
- im_nimf_gtk2_la_SOURCES = im-nimf.c
- -im_nimf_gtk2_la_CFLAGS = $(IM_NIMF_GTK2_DEPS_CFLAGS) $(AM_CFLAGS)
- +im_nimf_gtk2_la_CFLAGS = $(IM_NIMF_GTK2_DEPS_CFLAGS) $(AM_CFLAGS) \
- + -Wno-error=deprecated-declarations
- im_nimf_gtk2_la_LDFLAGS = $(IM_NIMF_GTK2_DEPS_LIBS) -avoid-version -module
- im_nimf_gtk2_la_LIBADD = $(top_builddir)/libnimf/libnimf.la
-
- diff --git a/modules/clients/qt4/Makefile.am b/modules/clients/qt4/Makefile.am
- deleted file mode 100644
- index 4dbad1c..0000000
- --- a/modules/clients/qt4/Makefile.am
- +++ /dev/null
- @@ -1,35 +0,0 @@
- -gsettings_SCHEMAS = org.nimf.clients.qt4.gschema.xml
- -@GSETTINGS_RULES@
- -
- -QT4_LIB_DIR = `pkg-config --variable=libdir QtCore`
- -QT4_MOC = `pkg-config --variable=moc_location QtCore`
- -
- -qt4_im_moduledir = $(QT4_LIB_DIR)/qt4/plugins/inputmethods
- -qt4_im_module_LTLIBRARIES = libqt4im-nimf.la
- -
- -BUILT_SOURCES = im-nimf-qt4.moc
- -libqt4im_nimf_la_SOURCES = im-nimf-qt4.cpp $(BUILT_SOURCES)
- -
- -libqt4im_nimf_la_CXXFLAGS = \
- - $(EXTRA_CFLAGS) \
- - $(LIBNIMF_DEPS_CFLAGS) \
- - -I$(top_srcdir)/libnimf \
- - -DG_LOG_DOMAIN=\"nimf\" \
- - $(IM_NIMF_QT4_DEPS_CFLAGS) \
- - -DQT_NO_KEYWORDS
- -
- -libqt4im_nimf_la_LDFLAGS = -avoid-version -module $(IM_NIMF_QT4_DEPS_LIBS) \
- - $(LIBNIMF_DEPS_LIBS)
- -libqt4im_nimf_la_LIBADD = $(top_builddir)/libnimf/libnimf.la
- -
- -im-nimf-qt4.moc: im-nimf-qt4.cpp
- - $(AM_V_GEN) $(QT4_MOC) im-nimf-qt4.cpp -o im-nimf-qt4.moc
- -
- -install-data-hook:
- - chmod -x $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.so
- - rm -f $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.la
- -
- -uninstall-hook:
- - rm -f $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.so
- -
- -DISTCLEANFILES = Makefile.in $(BUILT_SOURCES)
- diff --git a/modules/clients/qt4/im-nimf-qt4.cpp b/modules/clients/qt4/im-nimf-qt4.cpp
- deleted file mode 100644
- index 4864158..0000000
- --- a/modules/clients/qt4/im-nimf-qt4.cpp
- +++ /dev/null
- @@ -1,426 +0,0 @@
- -/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
- -/*
- - * im-nimf-qt4.cpp
- - * This file is part of Nimf.
- - *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- - *
- - * Nimf is free software: you can redistribute it and/or modify it
- - * under the terms of the GNU Lesser General Public License as published
- - * by the Free Software Foundation, either version 3 of the License, or
- - * (at your option) any later version.
- - *
- - * Nimf is distributed in the hope that it will be useful, but
- - * WITHOUT ANY WARRANTY; without even the implied warranty of
- - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- - * See the GNU Lesser General Public License for more details.
- - *
- - * You should have received a copy of the GNU Lesser General Public License
- - * along with this program; If not, see <http://www.gnu.org/licenses/>.
- - */
- -
- -#include <QApplication>
- -#include <QTextFormat>
- -#include <QInputContext>
- -#include <QInputContextPlugin>
- -#include <nimf.h>
- -
- -class NimfInputContext : public QInputContext
- -{
- - Q_OBJECT
- -public:
- - NimfInputContext ();
- - ~NimfInputContext ();
- -
- - virtual QString identifierName ();
- - virtual QString language ();
- -
- - virtual void reset ();
- - virtual void update ();
- - virtual bool isComposing () const;
- - virtual void setFocusWidget (QWidget *w);
- - virtual bool filterEvent (const QEvent *event);
- -
- - // nimf signal callbacks
- - static void on_preedit_start (NimfIM *im,
- - gpointer user_data);
- - static void on_preedit_end (NimfIM *im,
- - gpointer user_data);
- - static void on_preedit_changed (NimfIM *im,
- - gpointer user_data);
- - static void on_commit (NimfIM *im,
- - const gchar *text,
- - gpointer user_data);
- - static gboolean on_retrieve_surrounding (NimfIM *im,
- - gpointer user_data);
- - static gboolean on_delete_surrounding (NimfIM *im,
- - gint offset,
- - gint n_chars,
- - gpointer user_data);
- - static void on_beep (NimfIM *im,
- - gpointer user_data);
- - // settings
- - static void on_changed_reset_on_mouse_button_press (GSettings *settings,
- - gchar *key,
- - gpointer user_data);
- -private:
- - NimfIM *m_im;
- - bool m_isComposing;
- - NimfRectangle m_cursor_area;
- - GSettings *m_settings;
- - gboolean m_reset;
- -};
- -
- -/* nimf signal callbacks */
- -void
- -NimfInputContext::on_preedit_start (NimfIM *im, gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- - context->m_isComposing = true;
- -}
- -
- -void
- -NimfInputContext::on_preedit_end (NimfIM *im, gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- - context->m_isComposing = false;
- -}
- -
- -void
- -NimfInputContext::on_preedit_changed (NimfIM *im, gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- -
- - NimfPreeditAttr **preedit_attrs;
- - gchar *str;
- - gint cursor_pos;
- - gint i;
- -
- - nimf_im_get_preedit_string (im, &str, &preedit_attrs, &cursor_pos);
- - QString preeditText = QString::fromUtf8 (str);
- - g_free (str);
- - QList <QInputMethodEvent::Attribute> attrs;
- - // preedit text attribute
- - for (i = 0; preedit_attrs[i] != NULL; i++)
- - {
- - QTextCharFormat format;
- -
- - switch (preedit_attrs[i]->type)
- - {
- - case NIMF_PREEDIT_ATTR_HIGHLIGHT:
- - format.setBackground(Qt::green);
- - format.setForeground(Qt::black);
- - break;
- - case NIMF_PREEDIT_ATTR_UNDERLINE:
- - format.setUnderlineStyle(QTextCharFormat::DashUnderline);
- - break;
- - default:
- - format.setUnderlineStyle(QTextCharFormat::DashUnderline);
- - break;
- - }
- -
- - QInputMethodEvent::Attribute attr (QInputMethodEvent::TextFormat,
- - preedit_attrs[i]->start_index,
- - preedit_attrs[i]->end_index - preedit_attrs[i]->start_index,
- - QVariant (format));
- - attrs << attr;
- - }
- -
- - nimf_preedit_attr_freev (preedit_attrs);
- -
- - // cursor attribute
- - attrs << QInputMethodEvent::Attribute (QInputMethodEvent::Cursor,
- - cursor_pos, true, 0);
- -
- - QInputMethodEvent event (preeditText, attrs);
- - context->sendEvent (event);
- -}
- -
- -void
- -NimfInputContext::on_commit (NimfIM *im,
- - const gchar *text,
- - gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- - QString str = QString::fromUtf8 (text);
- - QInputMethodEvent event;
- - event.setCommitString (str);
- - context->sendEvent (event);
- -}
- -
- -gboolean
- -NimfInputContext::on_retrieve_surrounding (NimfIM *im, gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - QWidget *widget = qApp->focusWidget();
- -
- - if (!widget)
- - return FALSE;
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- -
- - QString string = widget->inputMethodQuery (Qt::ImSurroundingText).toString ();
- - uint pos = widget->inputMethodQuery (Qt::ImCursorPosition).toUInt ();
- -
- - nimf_im_set_surrounding (context->m_im,
- - string.toUtf8().constData(), -1, pos);
- - return TRUE;
- -}
- -
- -gboolean
- -NimfInputContext::on_delete_surrounding (NimfIM *im,
- - gint offset,
- - gint n_chars,
- - gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - QWidget *widget = qApp->focusWidget();
- -
- - if (!widget)
- - return FALSE;
- -
- - QInputMethodEvent event;
- - event.setCommitString ("", offset, n_chars);
- - QCoreApplication::sendEvent (widget, &event);
- -
- - return TRUE;
- -}
- -
- -void
- -NimfInputContext::on_beep (NimfIM *im, gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - QApplication::beep();
- -}
- -
- -void
- -NimfInputContext::on_changed_reset_on_mouse_button_press (GSettings *settings,
- - gchar *key,
- - gpointer user_data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
- -
- - context->m_reset = g_settings_get_boolean (settings, key);
- -
- - g_message ("%d", context->m_reset);
- -}
- -
- -NimfInputContext::NimfInputContext ()
- - : m_isComposing(false)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - m_im = nimf_im_new ();
- - m_settings = g_settings_new ("org.nimf.clients.qt4");
- - g_signal_connect (m_im, "preedit-start",
- - G_CALLBACK (NimfInputContext::on_preedit_start), this);
- - g_signal_connect (m_im, "preedit-end",
- - G_CALLBACK (NimfInputContext::on_preedit_end), this);
- - g_signal_connect (m_im, "preedit-changed",
- - G_CALLBACK (NimfInputContext::on_preedit_changed), this);
- - g_signal_connect (m_im, "commit",
- - G_CALLBACK (NimfInputContext::on_commit), this);
- - g_signal_connect (m_im, "retrieve-surrounding",
- - G_CALLBACK (NimfInputContext::on_retrieve_surrounding),
- - this);
- - g_signal_connect (m_im, "delete-surrounding",
- - G_CALLBACK (NimfInputContext::on_delete_surrounding), this);
- - g_signal_connect (m_im, "beep",
- - G_CALLBACK (NimfInputContext::on_beep), this);
- - g_signal_connect (m_settings, "changed::reset-on-mouse-button-press",
- - G_CALLBACK (NimfInputContext::on_changed_reset_on_mouse_button_press), this);
- - g_signal_emit_by_name (m_settings, "changed::reset-on-mouse-button-press",
- - "reset-on-mouse-button-press");
- -}
- -
- -NimfInputContext::~NimfInputContext ()
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - g_object_unref (m_im);
- - g_object_unref (m_settings);
- -}
- -
- -QString
- -NimfInputContext::identifierName ()
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QString ("nimf");
- -}
- -
- -QString
- -NimfInputContext::language ()
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QString ("");
- -}
- -
- -void
- -NimfInputContext::reset ()
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - nimf_im_reset (m_im);
- -}
- -
- -void
- -NimfInputContext::update ()
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - QWidget *widget = focusWidget ();
- -
- - if (widget)
- - {
- - QRect rect = widget->inputMethodQuery(Qt::ImMicroFocus).toRect();
- - QPoint point = widget->mapToGlobal (QPoint(0,0));
- - rect.translate (point);
- -
- - if (m_cursor_area.x != rect.x () ||
- - m_cursor_area.y != rect.y () ||
- - m_cursor_area.width != rect.width () ||
- - m_cursor_area.height != rect.height ())
- - {
- - m_cursor_area.x = rect.x ();
- - m_cursor_area.y = rect.y ();
- - m_cursor_area.width = rect.width ();
- - m_cursor_area.height = rect.height ();
- -
- - nimf_im_set_cursor_location (m_im, &m_cursor_area);
- - }
- - }
- -}
- -
- -bool
- -NimfInputContext::isComposing () const
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return m_isComposing;
- -}
- -
- -void
- -NimfInputContext::setFocusWidget (QWidget *w)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - if (!w)
- - nimf_im_focus_out (m_im);
- -
- - QInputContext::setFocusWidget (w);
- -
- - if (w)
- - nimf_im_focus_in (m_im);
- -
- - update ();
- -}
- -
- -bool
- -NimfInputContext::filterEvent (const QEvent *event)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - gboolean retval;
- - const QKeyEvent *key_event = static_cast<const QKeyEvent *>( event );
- - NimfEvent *nimf_event;
- - NimfEventType type = NIMF_EVENT_NOTHING;
- -
- - switch (event->type ())
- - {
- -#undef KeyPress
- - case QEvent::KeyPress:
- - type = NIMF_EVENT_KEY_PRESS;
- - break;
- -#undef KeyRelease
- - case QEvent::KeyRelease:
- - type = NIMF_EVENT_KEY_RELEASE;
- - break;
- - case QEvent::MouseButtonPress:
- - if (m_reset)
- - nimf_im_reset (m_im);
- - default:
- - return false;
- - }
- -
- - nimf_event = nimf_event_new (type);
- - nimf_event->key.state = key_event->nativeModifiers ();
- - nimf_event->key.keyval = key_event->nativeVirtualKey ();
- - nimf_event->key.hardware_keycode = key_event->nativeScanCode ();
- -
- - retval = nimf_im_filter_event (m_im, nimf_event);
- - nimf_event_free (nimf_event);
- -
- - return retval;
- -}
- -
- -/*
- - * class NimfInputContextPlugin
- - */
- -class NimfInputContextPlugin : public QInputContextPlugin
- -{
- - Q_OBJECT
- -public:
- - NimfInputContextPlugin ()
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- - }
- -
- - ~NimfInputContextPlugin ()
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- - }
- -
- - virtual QStringList keys () const
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QStringList () << "nimf";
- - }
- -
- - virtual QInputContext *create (const QString &key)
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return new NimfInputContext ();
- - }
- -
- - virtual QStringList languages (const QString &key)
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QStringList () << "ko" << "zh" << "ja";
- - }
- -
- - virtual QString displayName (const QString &key)
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QString ("Nimf");
- - }
- -
- - virtual QString description (const QString &key)
- - {
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - return QString ("nimf Qt4 im module");
- - }
- -};
- -
- -Q_EXPORT_PLUGIN2 (NimfInputContextPlugin, NimfInputContextPlugin)
- -
- -#include "im-nimf-qt4.moc"
- diff --git a/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml b/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
- deleted file mode 100644
- index 4c4b9bf..0000000
- --- a/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
- +++ /dev/null
- @@ -1,16 +0,0 @@
- -<?xml version="1.0" encoding="UTF-8"?>
- -<schemalist>
- - <schema id="org.nimf.clients.qt4"
- - path="/org/nimf/clients/qt4/" gettext-domain="nimf">
- - <key type="s" name="hidden-schema-name">
- - <default l10n="messages">'Qt4'</default>
- - <summary>schema name for nimf-settings</summary>
- - <description>This key is intended for nimf-settings.</description>
- - </key>
- - <key type="b" name="reset-on-mouse-button-press">
- - <default>true</default>
- - <summary>Reset when clicking the mouse button</summary>
- - <description>Reset when clicking the mouse button</description>
- - </key>
- - </schema>
- -</schemalist>
- diff --git a/modules/engines/nimf-anthy/nimf-anthy.c b/modules/engines/nimf-anthy/nimf-anthy.c
- index e0b9019..cb43aa1 100644
- --- a/modules/engines/nimf-anthy/nimf-anthy.c
- +++ b/modules/engines/nimf-anthy/nimf-anthy.c
- @@ -3,7 +3,7 @@
- * nimf-anthy.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2016-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2016-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -1572,14 +1572,14 @@ nimf_anthy_init (NimfAnthy *anthy)
- g_strfreev (hiragana_keys);
- g_strfreev (katakana_keys);
-
- - g_signal_connect (anthy->settings, "changed::hiragana-keys",
- - G_CALLBACK (on_changed_keys), anthy);
- - g_signal_connect (anthy->settings, "changed::katakana-keys",
- - G_CALLBACK (on_changed_keys), anthy);
- - g_signal_connect (anthy->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), anthy);
- - g_signal_connect (anthy->settings, "changed::get-n-input-mode-list",
- - G_CALLBACK (on_changed_n_input_mode), anthy);
- + g_signal_connect_data (anthy->settings, "changed::hiragana-keys",
- + G_CALLBACK (on_changed_keys), anthy, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (anthy->settings, "changed::katakana-keys",
- + G_CALLBACK (on_changed_keys), anthy, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (anthy->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), anthy, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (anthy->settings, "changed::get-n-input-mode-list",
- + G_CALLBACK (on_changed_n_input_mode), anthy, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-libhangul/nimf-libhangul.c b/modules/engines/nimf-libhangul/nimf-libhangul.c
- index 21d9f7d..e6d9cb2 100644
- --- a/modules/engines/nimf-libhangul/nimf-libhangul.c
- +++ b/modules/engines/nimf-libhangul/nimf-libhangul.c
- @@ -3,7 +3,7 @@
- * nimf-libhangul.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -47,7 +47,7 @@ struct _NimfLibhangul
- NimfKey **hanja_keys;
- GSettings *settings;
- gboolean is_double_consonant_rule;
- - gboolean is_auto_reordering;
- + gboolean auto_reordering;
- gchar *method;
- /* workaround: ignore reset called by commit callback in application */
- gboolean ignore_reset_in_commit_cb;
- @@ -612,35 +612,36 @@ nimf_libhangul_filter_event (NimfEngine *engine,
- gchar *new_preedit = g_ucs4_to_utf8 (ucs_preedit, -1, NULL, NULL, NULL);
- nimf_libhangul_update_preedit (engine, target, new_preedit);
-
- - return retval;
- -}
- -
- -static bool
- -on_libhangul_transition (HangulInputContext *ic,
- - ucschar c,
- - const ucschar *preedit,
- - void *data)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- -
- - if ((hangul_is_choseong (c) && (hangul_ic_has_jungseong (ic) ||
- - hangul_ic_has_jongseong (ic))) ||
- - (hangul_is_jungseong (c) && hangul_ic_has_jongseong (ic)))
- - return false;
- -
- - return true;
- -}
- -
- -static void
- -nimf_libhangul_update_transition_cb (NimfLibhangul *hangul)
- -{
- - g_debug (G_STRLOC ": %s", G_STRFUNC);
- + if (!retval)
- + {
- + switch (keyval)
- + {
- + case '_':
- + case '-':
- + case '+':
- + case '=':
- + case '{':
- + case '[':
- + case '}':
- + case ']':
- + case ':':
- + case ';':
- + case '\"':
- + case '\'':
- + case '<':
- + case ',':
- + case '>':
- + case '.':
- + case '?':
- + case '/':
- + nimf_libhangul_emit_commit (engine, target, (char *) &keyval);
- + retval = TRUE;
- + default:
- + break;
- + }
- + }
-
- - if ((g_strcmp0 (hangul->method, "2") == 0) && !hangul->is_auto_reordering)
- - hangul_ic_connect_callback (hangul->context, "transition",
- - on_libhangul_transition, NULL);
- - else
- - hangul_ic_connect_callback (hangul->context, "transition", NULL, NULL);
- + return retval;
- }
-
- static void
- @@ -653,7 +654,8 @@ on_changed_method (GSettings *settings,
- g_free (hangul->method);
- hangul->method = g_settings_get_string (settings, key);
- hangul_ic_select_keyboard (hangul->context, hangul->method);
- - nimf_libhangul_update_transition_cb (hangul);
- + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
- + hangul->auto_reordering);
- }
-
- static void
- @@ -663,8 +665,9 @@ on_changed_auto_reordering (GSettings *settings,
- {
- g_debug (G_STRLOC ": %s", G_STRFUNC);
-
- - hangul->is_auto_reordering = g_settings_get_boolean (settings, key);
- - nimf_libhangul_update_transition_cb (hangul);
- + hangul->auto_reordering = g_settings_get_boolean (settings, key);
- + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
- + hangul->auto_reordering);
- }
-
- static void
- @@ -716,7 +719,7 @@ nimf_libhangul_init (NimfLibhangul *hangul)
- hangul->method = g_settings_get_string (hangul->settings, "get-method-infos");
- hangul->is_double_consonant_rule =
- g_settings_get_boolean (hangul->settings, "double-consonant-rule");
- - hangul->is_auto_reordering =
- + hangul->auto_reordering =
- g_settings_get_boolean (hangul->settings, "auto-reordering");
- hangul->ignore_reset_in_commit_cb =
- g_settings_get_boolean (hangul->settings, "ignore-reset-in-commit-cb");
- @@ -741,18 +744,19 @@ nimf_libhangul_init (NimfLibhangul *hangul)
-
- g_strfreev (hanja_keys);
-
- - nimf_libhangul_update_transition_cb (hangul);
- -
- - g_signal_connect (hangul->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), hangul);
- - g_signal_connect (hangul->settings, "changed::hanja-keys",
- - G_CALLBACK (on_changed_keys), hangul);
- - g_signal_connect (hangul->settings, "changed::double-consonant-rule",
- - G_CALLBACK (on_changed_double_consonant_rule), hangul);
- - g_signal_connect (hangul->settings, "changed::auto-reordering",
- - G_CALLBACK (on_changed_auto_reordering), hangul);
- - g_signal_connect (hangul->settings, "changed::ignore-reset-in-commit-cb",
- - G_CALLBACK (on_changed_ignore_reset_in_commit_cb), hangul);
- + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
- + hangul->auto_reordering);
- +
- + g_signal_connect_data (hangul->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), hangul, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (hangul->settings, "changed::hanja-keys",
- + G_CALLBACK (on_changed_keys), hangul, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (hangul->settings, "changed::double-consonant-rule",
- + G_CALLBACK (on_changed_double_consonant_rule), hangul, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (hangul->settings, "changed::auto-reordering",
- + G_CALLBACK (on_changed_auto_reordering), hangul, NULL, G_CONNECT_AFTER);
- + g_signal_connect_data (hangul->settings, "changed::ignore-reset-in-commit-cb",
- + G_CALLBACK (on_changed_ignore_reset_in_commit_cb), hangul, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-am.c b/modules/engines/nimf-m17n/nimf-m17n-am.c
- index 02c1a3b..2d56766 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-am.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-am.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-am.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_am_init (NimfM17nAm *am)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ar.c b/modules/engines/nimf-m17n/nimf-m17n-ar.c
- index 24232b6..7e2b636 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ar.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ar.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ar.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ar_init (NimfM17nAr *ar)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-as.c b/modules/engines/nimf-m17n/nimf-m17n-as.c
- index 339257e..0f6fbca 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-as.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-as.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-as.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_as_init (NimfM17nAs *as)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ath.c b/modules/engines/nimf-m17n/nimf-m17n-ath.c
- index 405926f..a771f1b 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ath.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ath.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ath.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ath_init (NimfM17nAth *ath)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-be.c b/modules/engines/nimf-m17n/nimf-m17n-be.c
- index feee9fa..2491e12 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-be.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-be.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-be.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_be_init (NimfM17nBe *be)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-bla.c b/modules/engines/nimf-m17n/nimf-m17n-bla.c
- index 4e4bbe0..65ab4d7 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-bla.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-bla.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-bla.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_bla_init (NimfM17nBla *bla)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-bn.c b/modules/engines/nimf-m17n/nimf-m17n-bn.c
- index 7f54253..9cdaeab 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-bn.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-bn.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-bn.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_bn_init (NimfM17nBn *bn)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-bo.c b/modules/engines/nimf-m17n/nimf-m17n-bo.c
- index 0735648..88ace0b 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-bo.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-bo.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-bo.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_bo_init (NimfM17nBo *bo)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-cmc.c b/modules/engines/nimf-m17n/nimf-m17n-cmc.c
- index 961af02..e1659d5 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-cmc.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-cmc.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-cmc.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_cmc_init (NimfM17nCmc *cmc)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-cr.c b/modules/engines/nimf-m17n/nimf-m17n-cr.c
- index f7e2a28..a3916d1 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-cr.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-cr.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-cr.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_cr_init (NimfM17nCr *cr)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-cs.c b/modules/engines/nimf-m17n/nimf-m17n-cs.c
- index 5949142..44a5b0e 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-cs.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-cs.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-cs.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_cs_init (NimfM17nCs *cs)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-da.c b/modules/engines/nimf-m17n/nimf-m17n-da.c
- index 1e69f53..70c684e 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-da.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-da.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-da.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_da_init (NimfM17nDa *da)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-dv.c b/modules/engines/nimf-m17n/nimf-m17n-dv.c
- index 4b07a4a..bb9430a 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-dv.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-dv.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-dv.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_dv_init (NimfM17nDv *dv)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-el.c b/modules/engines/nimf-m17n/nimf-m17n-el.c
- index 408b010..5fc3cbc 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-el.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-el.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-el.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_el_init (NimfM17nEl *el)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-eo.c b/modules/engines/nimf-m17n/nimf-m17n-eo.c
- index a411c16..082456c 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-eo.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-eo.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-eo.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_eo_init (NimfM17nEo *eo)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-fa.c b/modules/engines/nimf-m17n/nimf-m17n-fa.c
- index 59676e4..e36ba7c 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-fa.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-fa.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-fa.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_fa_init (NimfM17nFa *fa)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-fr.c b/modules/engines/nimf-m17n/nimf-m17n-fr.c
- index c431495..53db099 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-fr.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-fr.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-fr.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_fr_init (NimfM17nFr *fr)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-grc.c b/modules/engines/nimf-m17n/nimf-m17n-grc.c
- index d66c3c7..142d989 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-grc.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-grc.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-grc.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_grc_init (NimfM17nGrc *grc)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-gu.c b/modules/engines/nimf-m17n/nimf-m17n-gu.c
- index 69f8dd6..9c6aecc 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-gu.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-gu.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-gu.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_gu_init (NimfM17nGu *gu)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-he.c b/modules/engines/nimf-m17n/nimf-m17n-he.c
- index a273d63..a682e1d 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-he.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-he.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-he.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_he_init (NimfM17nHe *he)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-hi.c b/modules/engines/nimf-m17n/nimf-m17n-hi.c
- index 03b275b..87a1fc4 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-hi.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-hi.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-hi.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_hi_init (NimfM17nHi *hi)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-hr.c b/modules/engines/nimf-m17n/nimf-m17n-hr.c
- index fa49741..b799073 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-hr.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-hr.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-hr.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_hr_init (NimfM17nHr *hr)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-hu.c b/modules/engines/nimf-m17n/nimf-m17n-hu.c
- index a168a7e..d09fb95 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-hu.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-hu.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-hu.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_hu_init (NimfM17nHu *hu)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-hy.c b/modules/engines/nimf-m17n/nimf-m17n-hy.c
- index 9daf653..6c81b7b 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-hy.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-hy.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-hy.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_hy_init (NimfM17nHy *hy)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ii.c b/modules/engines/nimf-m17n/nimf-m17n-ii.c
- index f678149..e5f3f30 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ii.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ii.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ii.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ii_init (NimfM17nIi *ii)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-iu.c b/modules/engines/nimf-m17n/nimf-m17n-iu.c
- index 8c443fa..65d6e09 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-iu.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-iu.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-iu.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_iu_init (NimfM17nIu *iu)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ka.c b/modules/engines/nimf-m17n/nimf-m17n-ka.c
- index 27757a1..be60e37 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ka.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ka.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ka.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ka_init (NimfM17nKa *ka)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-kk.c b/modules/engines/nimf-m17n/nimf-m17n-kk.c
- index 2cf7e9a..92480d1 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-kk.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-kk.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-kk.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_kk_init (NimfM17nKk *kk)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-km.c b/modules/engines/nimf-m17n/nimf-m17n-km.c
- index 25afedd..a442d72 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-km.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-km.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-km.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_km_init (NimfM17nKm *km)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-kn.c b/modules/engines/nimf-m17n/nimf-m17n-kn.c
- index 5d31c4c..ce11568 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-kn.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-kn.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-kn.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_kn_init (NimfM17nKn *kn)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ks.c b/modules/engines/nimf-m17n/nimf-m17n-ks.c
- index 372a1ed..e834cbe 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ks.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ks.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ks.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ks_init (NimfM17nKs *ks)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-lo.c b/modules/engines/nimf-m17n/nimf-m17n-lo.c
- index b410955..50d8666 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-lo.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-lo.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-lo.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_lo_init (NimfM17nLo *lo)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-mai.c b/modules/engines/nimf-m17n/nimf-m17n-mai.c
- index 263cbf8..017a882 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-mai.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-mai.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-mai.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_mai_init (NimfM17nMai *mai)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ml.c b/modules/engines/nimf-m17n/nimf-m17n-ml.c
- index ee4687c..f0fd8a9 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ml.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ml.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ml.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ml_init (NimfM17nMl *ml)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-mr.c b/modules/engines/nimf-m17n/nimf-m17n-mr.c
- index 575d644..33ccde8 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-mr.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-mr.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-mr.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_mr_init (NimfM17nMr *mr)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-my.c b/modules/engines/nimf-m17n/nimf-m17n-my.c
- index 39fb615..bfb01cf 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-my.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-my.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-my.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_my_init (NimfM17nMy *my)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ne.c b/modules/engines/nimf-m17n/nimf-m17n-ne.c
- index 757086c..7679733 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ne.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ne.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ne.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ne_init (NimfM17nNe *ne)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-nsk.c b/modules/engines/nimf-m17n/nimf-m17n-nsk.c
- index 95182f2..fae65d6 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-nsk.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-nsk.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-nsk.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_nsk_init (NimfM17nNsk *nsk)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-oj.c b/modules/engines/nimf-m17n/nimf-m17n-oj.c
- index 51a6a5d..01a17b8 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-oj.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-oj.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-oj.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_oj_init (NimfM17nOj *oj)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-or.c b/modules/engines/nimf-m17n/nimf-m17n-or.c
- index 47d4437..9f0652d 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-or.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-or.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-or.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_or_init (NimfM17nOr *or)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-pa.c b/modules/engines/nimf-m17n/nimf-m17n-pa.c
- index 474b5b2..b798d01 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-pa.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-pa.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-pa.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_pa_init (NimfM17nPa *pa)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ps.c b/modules/engines/nimf-m17n/nimf-m17n-ps.c
- index a28e677..4589708 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ps.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ps.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ps.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ps_init (NimfM17nPs *ps)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ru.c b/modules/engines/nimf-m17n/nimf-m17n-ru.c
- index 0b91db1..2d6f6bf 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ru.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ru.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ru.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ru_init (NimfM17nRu *ru)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-sa.c b/modules/engines/nimf-m17n/nimf-m17n-sa.c
- index b3d7946..e91bcba 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-sa.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-sa.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-sa.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_sa_init (NimfM17nSa *sa)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-sd.c b/modules/engines/nimf-m17n/nimf-m17n-sd.c
- index 1457e11..fd96cea 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-sd.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-sd.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-sd.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_sd_init (NimfM17nSd *sd)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-si.c b/modules/engines/nimf-m17n/nimf-m17n-si.c
- index a5b070f..82a73a9 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-si.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-si.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-si.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_si_init (NimfM17nSi *si)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-sk.c b/modules/engines/nimf-m17n/nimf-m17n-sk.c
- index 4e39a7d..6b308a4 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-sk.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-sk.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-sk.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_sk_init (NimfM17nSk *sk)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-sr.c b/modules/engines/nimf-m17n/nimf-m17n-sr.c
- index dfd9d80..be20d83 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-sr.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-sr.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-sr.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_sr_init (NimfM17nSr *sr)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-sv.c b/modules/engines/nimf-m17n/nimf-m17n-sv.c
- index 68dc43e..6541943 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-sv.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-sv.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-sv.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_sv_init (NimfM17nSv *sv)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-t.c b/modules/engines/nimf-m17n/nimf-m17n-t.c
- index dc0a10e..79a21dd 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-t.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-t.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-t.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_t_init (NimfM17nT *t)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ta.c b/modules/engines/nimf-m17n/nimf-m17n-ta.c
- index d3ad23b..7c62c99 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ta.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ta.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ta.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ta_init (NimfM17nTa *ta)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-tai.c b/modules/engines/nimf-m17n/nimf-m17n-tai.c
- index 9c0726b..9301892 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-tai.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-tai.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-tai.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_tai_init (NimfM17nTai *tai)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-te.c b/modules/engines/nimf-m17n/nimf-m17n-te.c
- index 6501774..4b54e94 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-te.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-te.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-te.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_te_init (NimfM17nTe *te)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-th.c b/modules/engines/nimf-m17n/nimf-m17n-th.c
- index 3c8d264..078799d 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-th.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-th.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-th.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_th_init (NimfM17nTh *th)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ug.c b/modules/engines/nimf-m17n/nimf-m17n-ug.c
- index 7ca81f2..ed72d0a 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ug.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ug.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ug.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ug_init (NimfM17nUg *ug)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-uk.c b/modules/engines/nimf-m17n/nimf-m17n-uk.c
- index d3bafc1..77400bc 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-uk.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-uk.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-uk.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_uk_init (NimfM17nUk *uk)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-ur.c b/modules/engines/nimf-m17n/nimf-m17n-ur.c
- index 1c6d550..f3e7904 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-ur.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-ur.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-ur.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_ur_init (NimfM17nUr *ur)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-uz.c b/modules/engines/nimf-m17n/nimf-m17n-uz.c
- index 9dacfc0..6d4d3a1 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-uz.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-uz.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-uz.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_uz_init (NimfM17nUz *uz)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-vi.c b/modules/engines/nimf-m17n/nimf-m17n-vi.c
- index 097ff35..8ac850f 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-vi.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-vi.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-vi.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_vi_init (NimfM17nVi *vi)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-m17n/nimf-m17n-yi.c b/modules/engines/nimf-m17n/nimf-m17n-yi.c
- index 86a0f94..b852270 100644
- --- a/modules/engines/nimf-m17n/nimf-m17n-yi.c
- +++ b/modules/engines/nimf-m17n/nimf-m17n-yi.c
- @@ -3,7 +3,7 @@
- * nimf-m17n-yi.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -58,8 +58,8 @@ nimf_m17n_yi_init (NimfM17nYi *yi)
-
- nimf_m17n_open_im (m17n);
-
- - g_signal_connect (m17n->settings, "changed::get-method-infos",
- - G_CALLBACK (on_changed_method), m17n);
- + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
- + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/engines/nimf-rime/nimf-rime.c b/modules/engines/nimf-rime/nimf-rime.c
- index 52c952e..1e2e255 100644
- --- a/modules/engines/nimf-rime/nimf-rime.c
- +++ b/modules/engines/nimf-rime/nimf-rime.c
- @@ -3,7 +3,7 @@
- * nimf-rime.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2016-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2016-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -432,8 +432,8 @@ nimf_rime_init (NimfRime *rime)
- rime->session_id = RimeCreateSession();
- RimeSetOption (rime->session_id, "simplification", rime->is_simplified);
-
- - g_signal_connect (rime->settings, "changed::simplification",
- - G_CALLBACK (on_changed_simplification), rime);
- + g_signal_connect_data (rime->settings, "changed::simplification",
- + G_CALLBACK (on_changed_simplification), rime, NULL, G_CONNECT_AFTER);
- }
-
- static void
- diff --git a/modules/services/indicator/nimf-indicator.c b/modules/services/indicator/nimf-indicator.c
- index eb4bffc..64c8296 100644
- --- a/modules/services/indicator/nimf-indicator.c
- +++ b/modules/services/indicator/nimf-indicator.c
- @@ -3,7 +3,7 @@
- * nimf-indicator.c
- * This file is part of Nimf.
- *
- - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- *
- * Nimf is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- @@ -119,7 +119,7 @@ on_menu_about (GSimpleAction *action,
- "artists", artists,
- "authors", authors,
- "comments", _("Nimf is an input method framework"),
- - "copyright", _("Copyright (c) 2015-2019 Hodong Kim"),
- + "copyright", _("Copyright (c) 2015-2020 Hodong Kim"),
- "documenters", documenters,
- "license-type", GTK_LICENSE_LGPL_3_0,
- "logo-icon-name", "nimf-logo",
- diff --git a/nimf.spec b/nimf.spec
- index b94eeb1..eeacb9c 100644
- --- a/nimf.spec
- +++ b/nimf.spec
- @@ -1,6 +1,6 @@
- Name: nimf
- Summary: An input method framework
- -Version: 2019.08.14
- +Version: 2020.04.28
- Release: 1%{?dist}
- License: LGPLv3+
- Group: User Interface/Desktops
- @@ -15,14 +15,12 @@ BuildRequires: intltool >= 0.50.1
- BuildRequires: gtk3-devel
- BuildRequires: gtk2-devel
- %if 0%{?is_opensuse}
- -BuildRequires: libqt4-devel
- BuildRequires: libqt5-qtbase-devel
- BuildRequires: libQt5Gui-private-headers-devel
- BuildRequires: libappindicator3-devel
- BuildRequires: rsvg-view
- BuildRequires: noto-sans-cjk-fonts
- %else
- -BuildRequires: qt4-devel
- BuildRequires: qt5-qtbase-devel
- BuildRequires: qt5-qtbase-private-devel
- BuildRequires: libappindicator-gtk3-devel
- @@ -132,7 +130,6 @@ fi
- %{_libdir}/gtk-3.0/*
- %{_libdir}/libnimf.so.*
- %{_libdir}/nimf/*
- -%{_libdir}/qt4/*
- %{_libdir}/qt5/*
- %{_datadir}/applications/*
- %{_datadir}/glib-2.0/*
- @@ -149,5 +146,5 @@ fi
- %{_libdir}/pkgconfig/*
-
- %changelog
- -* Wed Aug 14 2019 Hodong Kim <cogniti@gmail.com> - 2019.08.14-1
- -- See https://gitlab.com/nimf-i18n/nimf/blob/master/debian/changelog
- +* Tue Apr 28 2020 Hodong Kim <cogniti@gmail.com> - 2020.04.28-1
- +- See https://www.nimfsoft.com
- diff --git a/po/POTFILES.in b/po/POTFILES.in
- index 0381816..a952ca9 100644
- --- a/po/POTFILES.in
- +++ b/po/POTFILES.in
- @@ -13,7 +13,6 @@ modules/services/indicator/nimf-indicator.c
- [type: gettext/gsettings]bin/nimf-settings/org.nimf.settings.gschema.xml
- [type: gettext/gsettings]libnimf/org.nimf.gschema.xml
- [type: gettext/gsettings]modules/clients/gtk/org.nimf.clients.gtk.gschema.xml
- -[type: gettext/gsettings]modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
- [type: gettext/gsettings]modules/clients/qt5/org.nimf.clients.qt5.gschema.xml
- [type: gettext/gsettings]modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml
- [type: gettext/gsettings]modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml
- diff --git a/po/de.po b/po/de.po
- index 93219c3..53f1e9b 100644
- --- a/po/de.po
- +++ b/po/de.po
- @@ -1,7 +1,7 @@
- # German translation for Nimf
- -# Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- +# Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- # This file is distributed under the same license as the Nimf project.
- -# Hodong Kim <cogniti@gmail.com>, 2015-2019.
- +# Hodong Kim <cogniti@gmail.com>, 2015-2020.
- # Max Neupert <abonnements@revolwear.com>, 2017.
- #
- #, fuzzy
- @@ -10,7 +10,7 @@ msgstr ""
- "Project-Id-Version: nimf\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2019-07-03 17:54+0900\n"
- -"PO-Revision-Date: 2019-07-03 17:55+0900\n"
- +"PO-Revision-Date: 2020-04-28 22:12+0900\n"
- "Last-Translator: Max Neupert <abonnements@revolwear.com>\n"
- "Language-Team: German\n"
- "Language: de\n"
- @@ -168,7 +168,6 @@ msgstr ""
-
- #: ../libnimf/org.nimf.gschema.xml.h:2
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:2
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:2
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:2
- #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:2
- #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:2
- @@ -186,7 +185,6 @@ msgstr "nimf-settings Schema name"
-
- #: ../libnimf/org.nimf.gschema.xml.h:3
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:3
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:3
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:3
- #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:3
- #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:3
- @@ -275,15 +273,10 @@ msgstr ""
- "verhindert Fehler in vielen Anwendungen"
-
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:6
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:4
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:4
- msgid "Reset when clicking the mouse button"
- msgstr "Zurücksetzen bei Mausklick"
-
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:1
- -msgid "'Qt4'"
- -msgstr ""
- -
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:1
- msgid "'Qt5'"
- msgstr ""
- diff --git a/po/ko.po b/po/ko.po
- index abdc976..231912a 100644
- --- a/po/ko.po
- +++ b/po/ko.po
- @@ -1,7 +1,7 @@
- # Korean translation for Nimf
- -# Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
- +# Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
- # This file is distributed under the same license as the Nimf project.
- -# Hodong Kim <cogniti@gmail.com>, 2015-2019.
- +# Hodong Kim <cogniti@gmail.com>, 2015-2020.
- #
- #, fuzzy
- msgid ""
- @@ -9,7 +9,7 @@ msgstr ""
- "Project-Id-Version: nimf\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2019-07-03 17:54+0900\n"
- -"PO-Revision-Date: 2019-07-03 19:04+0900\n"
- +"PO-Revision-Date: 2020-04-28 22:12+0900\n"
- "Last-Translator: Hodong Kim <cogniti@gmail.com>\n"
- "Language-Team: Hodong Kim <cogniti@gmail.com>\n"
- "Language: ko\n"
- @@ -167,7 +167,6 @@ msgstr "'님프'"
-
- #: ../libnimf/org.nimf.gschema.xml.h:2
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:2
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:2
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:2
- #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:2
- #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:2
- @@ -185,7 +184,6 @@ msgstr "nimf-settings 를 위한 스키마 이름"
-
- #: ../libnimf/org.nimf.gschema.xml.h:3
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:3
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:3
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:3
- #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:3
- #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:3
- @@ -280,15 +278,10 @@ msgstr "모든 키 이벤트를 전달하기 전에 그것들을 투과시킵니
- " 이것은 여러 응용 프로그램의 버그를 회피합니다."
-
- #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:6
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:4
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:4
- msgid "Reset when clicking the mouse button"
- msgstr "마우스 버튼을 클릭할 때 리셋합니다"
-
- -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:1
- -msgid "'Qt4'"
- -msgstr ""
- -
- #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:1
- msgid "'Qt5'"
- msgstr ""
|