nimf-2020.04.28.patch 97 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732
  1. commit 92442c305096abf2773386ce67f24ceafa767e08
  2. Author: Hodong Kim <hodong@nimfsoft.com>
  3. Date: Tue Apr 28 23:40:19 2020 +0900
  4. 2020.04.28
  5. diff --git a/README b/README
  6. index 58c2691..4ec31ec 100644
  7. --- a/README
  8. +++ b/README
  9. @@ -17,7 +17,7 @@ Nimf provides:
  10. * Preedit window
  11. * Candidate
  12. * Client Modules:
  13. - * GTK+2, GTK+3, Qt4, Qt5
  14. + * GTK+2, GTK+3, Qt5
  15. * Settings tool to configure the Nimf:
  16. * nimf-settings
  17. * Development files:
  18. @@ -131,10 +131,10 @@ Compiling and installing
  19. sudo yum install epel-release
  20. sudo yum install gcc-c++ libtool glib2-devel pkgconfig intltool \
  21. - gtk3-devel gtk2-devel qt4-devel qt5-qtbase-devel \
  22. - qt5-qtbase-private-devel libappindicator-gtk3-devel librsvg2-tools \
  23. - google-noto-cjk-fonts libhangul-devel anthy-devel anthy \
  24. - libxkbcommon-devel wayland-devel libxklavier-devel gtk-doc
  25. + gtk3-devel gtk2-devel qt5-qtbase-devel qt5-qtbase-private-devel \
  26. + libappindicator-gtk3-devel librsvg2-tools google-noto-cjk-fonts \
  27. + libhangul-devel anthy-devel anthy libxkbcommon-devel wayland-devel \
  28. + libxklavier-devel gtk-doc
  29. rpmbuild -bb nimf-master/nimf.spec
  30. ls -R rpmbuild/RPMS/
  31. @@ -215,7 +215,7 @@ Debugging
  32. tail -f /var/log/daemon.log # or /var/log/syslog
  33. export GTK_IM_MODULE="nimf"
  34. - export QT4_IM_MODULE="nimf"
  35. + export QT4_IM_MODULE="xim"
  36. export QT_IM_MODULE="nimf"
  37. export XMODIFIERS="@im=nimf"
  38. export G_MESSAGES_DEBUG=nimf
  39. diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
  40. index 638ce58..c28c8c7 100644
  41. --- a/archlinux/PKGBUILD
  42. +++ b/archlinux/PKGBUILD
  43. @@ -1,7 +1,7 @@
  44. #
  45. # PKGBUILD
  46. # This file is part of Nimf.
  47. -#
  48. +# Author: Hodong Kim
  49. # Unlike other files in the Nimf project,
  50. # this PKGBUILD file is in the public domain.
  51. @@ -13,12 +13,12 @@ arch=('any')
  52. url="https://gitlab.com/nimf-i18n/nimf"
  53. license=('LGPL3')
  54. makedepends=('binutils' 'autoconf' 'automake' 'gcc' 'make' 'glib2' 'intltool'
  55. - 'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3' 'librsvg'
  56. + 'gtk3' 'gtk2' 'qt5-base' 'libappindicator-gtk3' 'librsvg'
  57. 'noto-fonts-cjk' 'libhangul' 'anthy' 'librime' 'libxkbcommon'
  58. 'wayland' 'libxklavier' 'm17n-lib' 'm17n-db' 'gtk-doc')
  59. -depends=('glib2' 'gtk3' 'gtk2' 'qt4' 'qt5-base' 'libappindicator-gtk3'
  60. - 'libhangul' 'anthy' 'librime' 'libxkbcommon' 'wayland' 'libxklavier'
  61. - 'm17n-lib' 'm17n-db')
  62. +depends=('glib2' 'gtk3' 'gtk2' 'qt5-base' 'libappindicator-gtk3' 'libhangul'
  63. + 'anthy' 'librime' 'libxkbcommon' 'wayland' 'libxklavier' 'm17n-lib'
  64. + 'm17n-db')
  65. optdepends=('brise: Rime schema repository'
  66. 'noto-fonts-cjk: Google Noto CJK fonts')
  67. source=("https://gitlab.com/nimf-i18n/nimf/-/archive/master/nimf-master.tar.bz2")
  68. diff --git a/bin/nimf/nimf.c b/bin/nimf/nimf.c
  69. index 0404c09..d2a6cc4 100644
  70. --- a/bin/nimf/nimf.c
  71. +++ b/bin/nimf/nimf.c
  72. @@ -3,7 +3,7 @@
  73. * nimf.c
  74. * This file is part of Nimf.
  75. *
  76. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  77. + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  78. *
  79. * Nimf is free software: you can redistribute it and/or modify it
  80. * under the terms of the GNU Lesser General Public License as published
  81. @@ -33,13 +33,14 @@
  82. #include <syslog.h>
  83. #include <errno.h>
  84. #include <glib-unix.h>
  85. +#include "nimf-utils-private.h"
  86. static gchar *
  87. nimf_get_nimf_path ()
  88. {
  89. g_debug (G_STRLOC ": %s", G_STRFUNC);
  90. - return g_strconcat (g_get_user_runtime_dir (), "/nimf", NULL);
  91. + return g_strdup_printf ("/run/user/%u/nimf", nimf_get_loginuid ());
  92. }
  93. static gboolean
  94. @@ -66,7 +67,7 @@ nimf_get_lock_path ()
  95. {
  96. g_debug (G_STRLOC ": %s", G_STRFUNC);
  97. - return g_strconcat (g_get_user_runtime_dir (), "/nimf/lock.pid", NULL);
  98. + return g_strdup_printf ("/run/user/%u/nimf/lock.pid", nimf_get_loginuid ());
  99. }
  100. static int
  101. diff --git a/configure.ac b/configure.ac
  102. index a969a44..69bbc8d 100644
  103. --- a/configure.ac
  104. +++ b/configure.ac
  105. @@ -1,6 +1,6 @@
  106. dnl Process this file with autoconf to produce a configure script.
  107. -AC_INIT(nimf, 2019.08.14)
  108. +AC_INIT(nimf, 2020.04.28)
  109. AC_CONFIG_HEADERS([config.h])
  110. AC_CONFIG_MACRO_DIR([m4])
  111. @@ -113,13 +113,9 @@ AS_IF([test "x$enable_nimf_anthy" != "xno" -a "x$HAVE_ANTHY_DIC" != "xyes"],
  112. AM_CONDITIONAL([ENABLE_NIMF_ANTHY], [test "x$enable_nimf_anthy" != "xno"])
  113. dnl ***************************************************************************
  114. -dnl im-nimf-qt4 im-nimf-qt5
  115. +dnl im-nimf-qt5
  116. dnl ***************************************************************************
  117. -PKG_CHECK_MODULES(IM_NIMF_QT4_DEPS, [QtGui], [],
  118. - [AC_MSG_ERROR([No package 'QtGui' found.
  119. - If you are using Debian, please install 'libqt4-dev'.])])
  120. -
  121. PKG_CHECK_MODULES(IM_NIMF_QT5_DEPS, [Qt5Core Qt5Gui Qt5Widgets], [],
  122. [AC_MSG_ERROR([Package requirements (Qt5Core Qt5Gui Qt5Widgets) were not met:
  123. If you are using Debian, please install 'qtbase5-dev'.])])
  124. @@ -310,7 +306,6 @@ AC_OUTPUT([
  125. modules/Makefile
  126. modules/clients/Makefile
  127. modules/clients/gtk/Makefile
  128. - modules/clients/qt4/Makefile
  129. modules/clients/qt5/Makefile
  130. modules/engines/Makefile
  131. modules/engines/nimf-anthy/Makefile
  132. diff --git a/data/im-config/23_nimf.rc b/data/im-config/23_nimf.rc
  133. index 2063e51..e18a1af 100644
  134. --- a/data/im-config/23_nimf.rc
  135. +++ b/data/im-config/23_nimf.rc
  136. @@ -5,7 +5,7 @@ fi
  137. if [ "$IM_CONFIG_PHASE" = 1 ]; then
  138. XMODIFIERS="@im=nimf"
  139. GTK_IM_MODULE=nimf
  140. - QT4_IM_MODULE=nimf
  141. + QT4_IM_MODULE=xim
  142. QT_IM_MODULE=nimf
  143. CLUTTER_IM_MODULE=xim
  144. fi
  145. diff --git a/data/nimf.conf b/data/nimf.conf
  146. index 05be33a..a495e94 100644
  147. --- a/data/nimf.conf
  148. +++ b/data/nimf.conf
  149. @@ -1,4 +1,4 @@
  150. GTK_IM_MODULE=nimf
  151. -QT4_IM_MODULE=nimf
  152. +QT4_IM_MODULE=xim
  153. QT_IM_MODULE=nimf
  154. XMODIFIERS=@im=nimf
  155. diff --git a/debian/changelog b/debian/changelog
  156. index f147500..dcfa464 100644
  157. --- a/debian/changelog
  158. +++ b/debian/changelog
  159. @@ -1,3 +1,13 @@
  160. +nimf (2020.04.28) stable; urgency=medium
  161. +
  162. + * Fixed auto-reordering
  163. + * Fixed errors when typing Hangul with the Dvorak layout.
  164. + * Fixed wrong path. This prevents nimf from running more than once.
  165. + Don't use g_get_user_runtime_dir()
  166. + * Fix an error on compiling im-nimf.c for gtk2
  167. +
  168. + -- Hodong Kim <nimfsoft@gmail.com> Tue, 28 Apr 2020 22:14:14 +0900
  169. +
  170. nimf (2019.08.14) stable; urgency=medium
  171. * Updated README
  172. diff --git a/debian/control b/debian/control
  173. index af19791..e4d38a7 100644
  174. --- a/debian/control
  175. +++ b/debian/control
  176. @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
  177. libgtk-3-dev,
  178. libgtk-3-bin,
  179. libgtk2.0-dev,
  180. - libqt4-dev,
  181. qtbase5-dev,
  182. qtbase5-private-dev,
  183. libappindicator3-dev,
  184. diff --git a/debian/nimf.install b/debian/nimf.install
  185. index 4800152..9315aee 100644
  186. --- a/debian/nimf.install
  187. +++ b/debian/nimf.install
  188. @@ -5,7 +5,6 @@ usr/lib/*/gtk-2.0
  189. usr/lib/*/gtk-3.0
  190. usr/lib/*/nimf/modules/libnimf-system-keyboard.so
  191. usr/lib/*/nimf/modules/services
  192. -usr/lib/*/qt4
  193. usr/lib/*/qt5
  194. usr/share/applications
  195. usr/share/glib-2.0/schemas/org.nimf.clients.*
  196. diff --git a/libnimf/nimf-im.c b/libnimf/nimf-im.c
  197. index ca8485b..8b78064 100644
  198. --- a/libnimf/nimf-im.c
  199. +++ b/libnimf/nimf-im.c
  200. @@ -3,7 +3,7 @@
  201. * nimf-im.c
  202. * This file is part of Nimf.
  203. *
  204. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  205. + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  206. *
  207. * Nimf is free software: you can redistribute it and/or modify it
  208. * under the terms of the GNU Lesser General Public License as published
  209. @@ -20,14 +20,12 @@
  210. */
  211. #include "nimf-im.h"
  212. -#include <string.h>
  213. #include "nimf-marshalers-private.h"
  214. #include "nimf-message-private.h"
  215. -#include <errno.h>
  216. #include <glib/gstdio.h>
  217. #include <gio/gunixsocketaddress.h>
  218. #include "nimf-utils.h"
  219. -#include <stdlib.h>
  220. +#include "nimf-utils-private.h"
  221. enum {
  222. PREEDIT_START,
  223. @@ -59,31 +57,11 @@ struct _NimfIMPrivate
  224. guint16 id;
  225. GFileMonitor *monitor;
  226. - uid_t uid;
  227. gboolean created;
  228. };
  229. G_DEFINE_TYPE_WITH_PRIVATE (NimfIM, nimf_im, G_TYPE_OBJECT);
  230. -static uid_t
  231. -get_login_uid (void)
  232. -{
  233. - gchar *nptr;
  234. - gsize length;
  235. - uid_t uid;
  236. -
  237. - if (!g_file_get_contents ("/proc/self/loginuid", &nptr, &length, NULL))
  238. - return -1;
  239. -
  240. - errno = 0;
  241. - uid = strtol (nptr, NULL, 10);
  242. -
  243. - if (errno)
  244. - return -1;
  245. - else
  246. - return uid;
  247. -}
  248. -
  249. static gboolean
  250. nimf_im_is_connected ()
  251. {
  252. @@ -283,7 +261,7 @@ nimf_im_connect (NimfIM *im)
  253. {
  254. if (g_stat (nimf_im_socket_path, &info) == 0)
  255. {
  256. - if (im->priv->uid == info.st_uid)
  257. + if (nimf_get_loginuid () == info.st_uid)
  258. {
  259. if (g_socket_connect (nimf_im_socket, address, NULL, &error))
  260. {
  261. @@ -616,9 +594,6 @@ nimf_im_init (NimfIM *im)
  262. static guint16 next_id = 0;
  263. guint16 id;
  264. - if ((im->priv->uid = get_login_uid ()) == (uid_t) -1)
  265. - im->priv->uid = getuid ();
  266. -
  267. if (!nimf_im_socket_path)
  268. nimf_im_socket_path = nimf_get_socket_path ();
  269. diff --git a/libnimf/nimf-utils-private.h b/libnimf/nimf-utils-private.h
  270. index eacb64f..a59ccf4 100644
  271. --- a/libnimf/nimf-utils-private.h
  272. +++ b/libnimf/nimf-utils-private.h
  273. @@ -3,7 +3,7 @@
  274. * nimf-utils-private.h
  275. * This file is part of Nimf.
  276. *
  277. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  278. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  279. *
  280. * Nimf is free software: you can redistribute it and/or modify it
  281. * under the terms of the GNU Lesser General Public License as published
  282. @@ -28,6 +28,8 @@ G_BEGIN_DECLS
  283. gboolean gnome_is_running (void);
  284. gboolean gnome_xkb_is_available (void);
  285. +uid_t nimf_get_loginuid (void);
  286. +
  287. G_END_DECLS
  288. #endif /* __NIMF_UTILS_PRIVATE_H__ */
  289. diff --git a/libnimf/nimf-utils.c b/libnimf/nimf-utils.c
  290. index 9717ecc..9738fab 100644
  291. --- a/libnimf/nimf-utils.c
  292. +++ b/libnimf/nimf-utils.c
  293. @@ -3,7 +3,7 @@
  294. * nimf-utils.c
  295. * This file is part of Nimf.
  296. *
  297. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  298. + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  299. *
  300. * Nimf is free software: you can redistribute it and/or modify it
  301. * under the terms of the GNU Lesser General Public License as published
  302. @@ -22,6 +22,7 @@
  303. #include "nimf-utils.h"
  304. #include "nimf-enum-types-private.h"
  305. #include <gio/gio.h>
  306. +#include <errno.h>
  307. /**
  308. * SECTION:nimf-utils
  309. @@ -45,6 +46,33 @@ nimf_keyval_to_keysym_name (guint keyval)
  310. return enum_value ? enum_value->value_nick : NULL;
  311. }
  312. +uid_t
  313. +nimf_get_loginuid (void)
  314. +{
  315. + gchar *loginuid;
  316. + static uid_t uid = -1;
  317. +
  318. + if (uid == (uid_t) -1)
  319. + {
  320. + g_file_get_contents ("/proc/self/loginuid", &loginuid, NULL, NULL);
  321. +
  322. + if (loginuid)
  323. + {
  324. + errno = 0;
  325. + uid = strtol (loginuid, NULL, 10);
  326. +
  327. + g_free (loginuid);
  328. +
  329. + if (!errno)
  330. + return uid;
  331. + }
  332. +
  333. + uid = getuid ();
  334. + }
  335. +
  336. + return uid;
  337. +}
  338. +
  339. /**
  340. * nimf_get_socket_path:
  341. *
  342. @@ -55,7 +83,7 @@ nimf_get_socket_path ()
  343. {
  344. g_debug (G_STRLOC ": %s", G_STRFUNC);
  345. - return g_strconcat (g_get_user_runtime_dir (), "/nimf/socket", NULL);
  346. + return g_strdup_printf ("/run/user/%u/nimf/socket", nimf_get_loginuid ());
  347. }
  348. /* private */
  349. diff --git a/modules/clients/Makefile.am b/modules/clients/Makefile.am
  350. index 8957aac..3cb9a22 100644
  351. --- a/modules/clients/Makefile.am
  352. +++ b/modules/clients/Makefile.am
  353. @@ -1,3 +1,3 @@
  354. -SUBDIRS = gtk qt4 qt5
  355. +SUBDIRS = gtk qt5
  356. DISTCLEANFILES = Makefile.in
  357. diff --git a/modules/clients/gtk/Makefile.am b/modules/clients/gtk/Makefile.am
  358. index f7752e2..6d1ca56 100644
  359. --- a/modules/clients/gtk/Makefile.am
  360. +++ b/modules/clients/gtk/Makefile.am
  361. @@ -22,7 +22,8 @@ gtk2_im_moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
  362. gtk2_im_module_LTLIBRARIES = im-nimf-gtk2.la
  363. im_nimf_gtk2_la_SOURCES = im-nimf.c
  364. -im_nimf_gtk2_la_CFLAGS = $(IM_NIMF_GTK2_DEPS_CFLAGS) $(AM_CFLAGS)
  365. +im_nimf_gtk2_la_CFLAGS = $(IM_NIMF_GTK2_DEPS_CFLAGS) $(AM_CFLAGS) \
  366. + -Wno-error=deprecated-declarations
  367. im_nimf_gtk2_la_LDFLAGS = $(IM_NIMF_GTK2_DEPS_LIBS) -avoid-version -module
  368. im_nimf_gtk2_la_LIBADD = $(top_builddir)/libnimf/libnimf.la
  369. diff --git a/modules/clients/qt4/Makefile.am b/modules/clients/qt4/Makefile.am
  370. deleted file mode 100644
  371. index 4dbad1c..0000000
  372. --- a/modules/clients/qt4/Makefile.am
  373. +++ /dev/null
  374. @@ -1,35 +0,0 @@
  375. -gsettings_SCHEMAS = org.nimf.clients.qt4.gschema.xml
  376. -@GSETTINGS_RULES@
  377. -
  378. -QT4_LIB_DIR = `pkg-config --variable=libdir QtCore`
  379. -QT4_MOC = `pkg-config --variable=moc_location QtCore`
  380. -
  381. -qt4_im_moduledir = $(QT4_LIB_DIR)/qt4/plugins/inputmethods
  382. -qt4_im_module_LTLIBRARIES = libqt4im-nimf.la
  383. -
  384. -BUILT_SOURCES = im-nimf-qt4.moc
  385. -libqt4im_nimf_la_SOURCES = im-nimf-qt4.cpp $(BUILT_SOURCES)
  386. -
  387. -libqt4im_nimf_la_CXXFLAGS = \
  388. - $(EXTRA_CFLAGS) \
  389. - $(LIBNIMF_DEPS_CFLAGS) \
  390. - -I$(top_srcdir)/libnimf \
  391. - -DG_LOG_DOMAIN=\"nimf\" \
  392. - $(IM_NIMF_QT4_DEPS_CFLAGS) \
  393. - -DQT_NO_KEYWORDS
  394. -
  395. -libqt4im_nimf_la_LDFLAGS = -avoid-version -module $(IM_NIMF_QT4_DEPS_LIBS) \
  396. - $(LIBNIMF_DEPS_LIBS)
  397. -libqt4im_nimf_la_LIBADD = $(top_builddir)/libnimf/libnimf.la
  398. -
  399. -im-nimf-qt4.moc: im-nimf-qt4.cpp
  400. - $(AM_V_GEN) $(QT4_MOC) im-nimf-qt4.cpp -o im-nimf-qt4.moc
  401. -
  402. -install-data-hook:
  403. - chmod -x $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.so
  404. - rm -f $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.la
  405. -
  406. -uninstall-hook:
  407. - rm -f $(DESTDIR)$(qt4_im_moduledir)/libqt4im-nimf.so
  408. -
  409. -DISTCLEANFILES = Makefile.in $(BUILT_SOURCES)
  410. diff --git a/modules/clients/qt4/im-nimf-qt4.cpp b/modules/clients/qt4/im-nimf-qt4.cpp
  411. deleted file mode 100644
  412. index 4864158..0000000
  413. --- a/modules/clients/qt4/im-nimf-qt4.cpp
  414. +++ /dev/null
  415. @@ -1,426 +0,0 @@
  416. -/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
  417. -/*
  418. - * im-nimf-qt4.cpp
  419. - * This file is part of Nimf.
  420. - *
  421. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  422. - *
  423. - * Nimf is free software: you can redistribute it and/or modify it
  424. - * under the terms of the GNU Lesser General Public License as published
  425. - * by the Free Software Foundation, either version 3 of the License, or
  426. - * (at your option) any later version.
  427. - *
  428. - * Nimf is distributed in the hope that it will be useful, but
  429. - * WITHOUT ANY WARRANTY; without even the implied warranty of
  430. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  431. - * See the GNU Lesser General Public License for more details.
  432. - *
  433. - * You should have received a copy of the GNU Lesser General Public License
  434. - * along with this program; If not, see <http://www.gnu.org/licenses/>.
  435. - */
  436. -
  437. -#include <QApplication>
  438. -#include <QTextFormat>
  439. -#include <QInputContext>
  440. -#include <QInputContextPlugin>
  441. -#include <nimf.h>
  442. -
  443. -class NimfInputContext : public QInputContext
  444. -{
  445. - Q_OBJECT
  446. -public:
  447. - NimfInputContext ();
  448. - ~NimfInputContext ();
  449. -
  450. - virtual QString identifierName ();
  451. - virtual QString language ();
  452. -
  453. - virtual void reset ();
  454. - virtual void update ();
  455. - virtual bool isComposing () const;
  456. - virtual void setFocusWidget (QWidget *w);
  457. - virtual bool filterEvent (const QEvent *event);
  458. -
  459. - // nimf signal callbacks
  460. - static void on_preedit_start (NimfIM *im,
  461. - gpointer user_data);
  462. - static void on_preedit_end (NimfIM *im,
  463. - gpointer user_data);
  464. - static void on_preedit_changed (NimfIM *im,
  465. - gpointer user_data);
  466. - static void on_commit (NimfIM *im,
  467. - const gchar *text,
  468. - gpointer user_data);
  469. - static gboolean on_retrieve_surrounding (NimfIM *im,
  470. - gpointer user_data);
  471. - static gboolean on_delete_surrounding (NimfIM *im,
  472. - gint offset,
  473. - gint n_chars,
  474. - gpointer user_data);
  475. - static void on_beep (NimfIM *im,
  476. - gpointer user_data);
  477. - // settings
  478. - static void on_changed_reset_on_mouse_button_press (GSettings *settings,
  479. - gchar *key,
  480. - gpointer user_data);
  481. -private:
  482. - NimfIM *m_im;
  483. - bool m_isComposing;
  484. - NimfRectangle m_cursor_area;
  485. - GSettings *m_settings;
  486. - gboolean m_reset;
  487. -};
  488. -
  489. -/* nimf signal callbacks */
  490. -void
  491. -NimfInputContext::on_preedit_start (NimfIM *im, gpointer user_data)
  492. -{
  493. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  494. -
  495. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  496. - context->m_isComposing = true;
  497. -}
  498. -
  499. -void
  500. -NimfInputContext::on_preedit_end (NimfIM *im, gpointer user_data)
  501. -{
  502. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  503. -
  504. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  505. - context->m_isComposing = false;
  506. -}
  507. -
  508. -void
  509. -NimfInputContext::on_preedit_changed (NimfIM *im, gpointer user_data)
  510. -{
  511. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  512. -
  513. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  514. -
  515. - NimfPreeditAttr **preedit_attrs;
  516. - gchar *str;
  517. - gint cursor_pos;
  518. - gint i;
  519. -
  520. - nimf_im_get_preedit_string (im, &str, &preedit_attrs, &cursor_pos);
  521. - QString preeditText = QString::fromUtf8 (str);
  522. - g_free (str);
  523. - QList <QInputMethodEvent::Attribute> attrs;
  524. - // preedit text attribute
  525. - for (i = 0; preedit_attrs[i] != NULL; i++)
  526. - {
  527. - QTextCharFormat format;
  528. -
  529. - switch (preedit_attrs[i]->type)
  530. - {
  531. - case NIMF_PREEDIT_ATTR_HIGHLIGHT:
  532. - format.setBackground(Qt::green);
  533. - format.setForeground(Qt::black);
  534. - break;
  535. - case NIMF_PREEDIT_ATTR_UNDERLINE:
  536. - format.setUnderlineStyle(QTextCharFormat::DashUnderline);
  537. - break;
  538. - default:
  539. - format.setUnderlineStyle(QTextCharFormat::DashUnderline);
  540. - break;
  541. - }
  542. -
  543. - QInputMethodEvent::Attribute attr (QInputMethodEvent::TextFormat,
  544. - preedit_attrs[i]->start_index,
  545. - preedit_attrs[i]->end_index - preedit_attrs[i]->start_index,
  546. - QVariant (format));
  547. - attrs << attr;
  548. - }
  549. -
  550. - nimf_preedit_attr_freev (preedit_attrs);
  551. -
  552. - // cursor attribute
  553. - attrs << QInputMethodEvent::Attribute (QInputMethodEvent::Cursor,
  554. - cursor_pos, true, 0);
  555. -
  556. - QInputMethodEvent event (preeditText, attrs);
  557. - context->sendEvent (event);
  558. -}
  559. -
  560. -void
  561. -NimfInputContext::on_commit (NimfIM *im,
  562. - const gchar *text,
  563. - gpointer user_data)
  564. -{
  565. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  566. -
  567. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  568. - QString str = QString::fromUtf8 (text);
  569. - QInputMethodEvent event;
  570. - event.setCommitString (str);
  571. - context->sendEvent (event);
  572. -}
  573. -
  574. -gboolean
  575. -NimfInputContext::on_retrieve_surrounding (NimfIM *im, gpointer user_data)
  576. -{
  577. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  578. -
  579. - QWidget *widget = qApp->focusWidget();
  580. -
  581. - if (!widget)
  582. - return FALSE;
  583. -
  584. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  585. -
  586. - QString string = widget->inputMethodQuery (Qt::ImSurroundingText).toString ();
  587. - uint pos = widget->inputMethodQuery (Qt::ImCursorPosition).toUInt ();
  588. -
  589. - nimf_im_set_surrounding (context->m_im,
  590. - string.toUtf8().constData(), -1, pos);
  591. - return TRUE;
  592. -}
  593. -
  594. -gboolean
  595. -NimfInputContext::on_delete_surrounding (NimfIM *im,
  596. - gint offset,
  597. - gint n_chars,
  598. - gpointer user_data)
  599. -{
  600. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  601. -
  602. - QWidget *widget = qApp->focusWidget();
  603. -
  604. - if (!widget)
  605. - return FALSE;
  606. -
  607. - QInputMethodEvent event;
  608. - event.setCommitString ("", offset, n_chars);
  609. - QCoreApplication::sendEvent (widget, &event);
  610. -
  611. - return TRUE;
  612. -}
  613. -
  614. -void
  615. -NimfInputContext::on_beep (NimfIM *im, gpointer user_data)
  616. -{
  617. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  618. -
  619. - QApplication::beep();
  620. -}
  621. -
  622. -void
  623. -NimfInputContext::on_changed_reset_on_mouse_button_press (GSettings *settings,
  624. - gchar *key,
  625. - gpointer user_data)
  626. -{
  627. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  628. -
  629. - NimfInputContext *context = static_cast<NimfInputContext *>(user_data);
  630. -
  631. - context->m_reset = g_settings_get_boolean (settings, key);
  632. -
  633. - g_message ("%d", context->m_reset);
  634. -}
  635. -
  636. -NimfInputContext::NimfInputContext ()
  637. - : m_isComposing(false)
  638. -{
  639. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  640. -
  641. - m_im = nimf_im_new ();
  642. - m_settings = g_settings_new ("org.nimf.clients.qt4");
  643. - g_signal_connect (m_im, "preedit-start",
  644. - G_CALLBACK (NimfInputContext::on_preedit_start), this);
  645. - g_signal_connect (m_im, "preedit-end",
  646. - G_CALLBACK (NimfInputContext::on_preedit_end), this);
  647. - g_signal_connect (m_im, "preedit-changed",
  648. - G_CALLBACK (NimfInputContext::on_preedit_changed), this);
  649. - g_signal_connect (m_im, "commit",
  650. - G_CALLBACK (NimfInputContext::on_commit), this);
  651. - g_signal_connect (m_im, "retrieve-surrounding",
  652. - G_CALLBACK (NimfInputContext::on_retrieve_surrounding),
  653. - this);
  654. - g_signal_connect (m_im, "delete-surrounding",
  655. - G_CALLBACK (NimfInputContext::on_delete_surrounding), this);
  656. - g_signal_connect (m_im, "beep",
  657. - G_CALLBACK (NimfInputContext::on_beep), this);
  658. - g_signal_connect (m_settings, "changed::reset-on-mouse-button-press",
  659. - G_CALLBACK (NimfInputContext::on_changed_reset_on_mouse_button_press), this);
  660. - g_signal_emit_by_name (m_settings, "changed::reset-on-mouse-button-press",
  661. - "reset-on-mouse-button-press");
  662. -}
  663. -
  664. -NimfInputContext::~NimfInputContext ()
  665. -{
  666. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  667. -
  668. - g_object_unref (m_im);
  669. - g_object_unref (m_settings);
  670. -}
  671. -
  672. -QString
  673. -NimfInputContext::identifierName ()
  674. -{
  675. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  676. -
  677. - return QString ("nimf");
  678. -}
  679. -
  680. -QString
  681. -NimfInputContext::language ()
  682. -{
  683. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  684. -
  685. - return QString ("");
  686. -}
  687. -
  688. -void
  689. -NimfInputContext::reset ()
  690. -{
  691. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  692. -
  693. - nimf_im_reset (m_im);
  694. -}
  695. -
  696. -void
  697. -NimfInputContext::update ()
  698. -{
  699. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  700. -
  701. - QWidget *widget = focusWidget ();
  702. -
  703. - if (widget)
  704. - {
  705. - QRect rect = widget->inputMethodQuery(Qt::ImMicroFocus).toRect();
  706. - QPoint point = widget->mapToGlobal (QPoint(0,0));
  707. - rect.translate (point);
  708. -
  709. - if (m_cursor_area.x != rect.x () ||
  710. - m_cursor_area.y != rect.y () ||
  711. - m_cursor_area.width != rect.width () ||
  712. - m_cursor_area.height != rect.height ())
  713. - {
  714. - m_cursor_area.x = rect.x ();
  715. - m_cursor_area.y = rect.y ();
  716. - m_cursor_area.width = rect.width ();
  717. - m_cursor_area.height = rect.height ();
  718. -
  719. - nimf_im_set_cursor_location (m_im, &m_cursor_area);
  720. - }
  721. - }
  722. -}
  723. -
  724. -bool
  725. -NimfInputContext::isComposing () const
  726. -{
  727. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  728. -
  729. - return m_isComposing;
  730. -}
  731. -
  732. -void
  733. -NimfInputContext::setFocusWidget (QWidget *w)
  734. -{
  735. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  736. -
  737. - if (!w)
  738. - nimf_im_focus_out (m_im);
  739. -
  740. - QInputContext::setFocusWidget (w);
  741. -
  742. - if (w)
  743. - nimf_im_focus_in (m_im);
  744. -
  745. - update ();
  746. -}
  747. -
  748. -bool
  749. -NimfInputContext::filterEvent (const QEvent *event)
  750. -{
  751. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  752. -
  753. - gboolean retval;
  754. - const QKeyEvent *key_event = static_cast<const QKeyEvent *>( event );
  755. - NimfEvent *nimf_event;
  756. - NimfEventType type = NIMF_EVENT_NOTHING;
  757. -
  758. - switch (event->type ())
  759. - {
  760. -#undef KeyPress
  761. - case QEvent::KeyPress:
  762. - type = NIMF_EVENT_KEY_PRESS;
  763. - break;
  764. -#undef KeyRelease
  765. - case QEvent::KeyRelease:
  766. - type = NIMF_EVENT_KEY_RELEASE;
  767. - break;
  768. - case QEvent::MouseButtonPress:
  769. - if (m_reset)
  770. - nimf_im_reset (m_im);
  771. - default:
  772. - return false;
  773. - }
  774. -
  775. - nimf_event = nimf_event_new (type);
  776. - nimf_event->key.state = key_event->nativeModifiers ();
  777. - nimf_event->key.keyval = key_event->nativeVirtualKey ();
  778. - nimf_event->key.hardware_keycode = key_event->nativeScanCode ();
  779. -
  780. - retval = nimf_im_filter_event (m_im, nimf_event);
  781. - nimf_event_free (nimf_event);
  782. -
  783. - return retval;
  784. -}
  785. -
  786. -/*
  787. - * class NimfInputContextPlugin
  788. - */
  789. -class NimfInputContextPlugin : public QInputContextPlugin
  790. -{
  791. - Q_OBJECT
  792. -public:
  793. - NimfInputContextPlugin ()
  794. - {
  795. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  796. - }
  797. -
  798. - ~NimfInputContextPlugin ()
  799. - {
  800. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  801. - }
  802. -
  803. - virtual QStringList keys () const
  804. - {
  805. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  806. -
  807. - return QStringList () << "nimf";
  808. - }
  809. -
  810. - virtual QInputContext *create (const QString &key)
  811. - {
  812. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  813. -
  814. - return new NimfInputContext ();
  815. - }
  816. -
  817. - virtual QStringList languages (const QString &key)
  818. - {
  819. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  820. -
  821. - return QStringList () << "ko" << "zh" << "ja";
  822. - }
  823. -
  824. - virtual QString displayName (const QString &key)
  825. - {
  826. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  827. -
  828. - return QString ("Nimf");
  829. - }
  830. -
  831. - virtual QString description (const QString &key)
  832. - {
  833. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  834. -
  835. - return QString ("nimf Qt4 im module");
  836. - }
  837. -};
  838. -
  839. -Q_EXPORT_PLUGIN2 (NimfInputContextPlugin, NimfInputContextPlugin)
  840. -
  841. -#include "im-nimf-qt4.moc"
  842. diff --git a/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml b/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
  843. deleted file mode 100644
  844. index 4c4b9bf..0000000
  845. --- a/modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
  846. +++ /dev/null
  847. @@ -1,16 +0,0 @@
  848. -<?xml version="1.0" encoding="UTF-8"?>
  849. -<schemalist>
  850. - <schema id="org.nimf.clients.qt4"
  851. - path="/org/nimf/clients/qt4/" gettext-domain="nimf">
  852. - <key type="s" name="hidden-schema-name">
  853. - <default l10n="messages">'Qt4'</default>
  854. - <summary>schema name for nimf-settings</summary>
  855. - <description>This key is intended for nimf-settings.</description>
  856. - </key>
  857. - <key type="b" name="reset-on-mouse-button-press">
  858. - <default>true</default>
  859. - <summary>Reset when clicking the mouse button</summary>
  860. - <description>Reset when clicking the mouse button</description>
  861. - </key>
  862. - </schema>
  863. -</schemalist>
  864. diff --git a/modules/engines/nimf-anthy/nimf-anthy.c b/modules/engines/nimf-anthy/nimf-anthy.c
  865. index e0b9019..cb43aa1 100644
  866. --- a/modules/engines/nimf-anthy/nimf-anthy.c
  867. +++ b/modules/engines/nimf-anthy/nimf-anthy.c
  868. @@ -3,7 +3,7 @@
  869. * nimf-anthy.c
  870. * This file is part of Nimf.
  871. *
  872. - * Copyright (C) 2016-2019 Hodong Kim <cogniti@gmail.com>
  873. + * Copyright (C) 2016-2020 Hodong Kim <cogniti@gmail.com>
  874. *
  875. * Nimf is free software: you can redistribute it and/or modify it
  876. * under the terms of the GNU Lesser General Public License as published
  877. @@ -1572,14 +1572,14 @@ nimf_anthy_init (NimfAnthy *anthy)
  878. g_strfreev (hiragana_keys);
  879. g_strfreev (katakana_keys);
  880. - g_signal_connect (anthy->settings, "changed::hiragana-keys",
  881. - G_CALLBACK (on_changed_keys), anthy);
  882. - g_signal_connect (anthy->settings, "changed::katakana-keys",
  883. - G_CALLBACK (on_changed_keys), anthy);
  884. - g_signal_connect (anthy->settings, "changed::get-method-infos",
  885. - G_CALLBACK (on_changed_method), anthy);
  886. - g_signal_connect (anthy->settings, "changed::get-n-input-mode-list",
  887. - G_CALLBACK (on_changed_n_input_mode), anthy);
  888. + g_signal_connect_data (anthy->settings, "changed::hiragana-keys",
  889. + G_CALLBACK (on_changed_keys), anthy, NULL, G_CONNECT_AFTER);
  890. + g_signal_connect_data (anthy->settings, "changed::katakana-keys",
  891. + G_CALLBACK (on_changed_keys), anthy, NULL, G_CONNECT_AFTER);
  892. + g_signal_connect_data (anthy->settings, "changed::get-method-infos",
  893. + G_CALLBACK (on_changed_method), anthy, NULL, G_CONNECT_AFTER);
  894. + g_signal_connect_data (anthy->settings, "changed::get-n-input-mode-list",
  895. + G_CALLBACK (on_changed_n_input_mode), anthy, NULL, G_CONNECT_AFTER);
  896. }
  897. static void
  898. diff --git a/modules/engines/nimf-libhangul/nimf-libhangul.c b/modules/engines/nimf-libhangul/nimf-libhangul.c
  899. index 21d9f7d..e6d9cb2 100644
  900. --- a/modules/engines/nimf-libhangul/nimf-libhangul.c
  901. +++ b/modules/engines/nimf-libhangul/nimf-libhangul.c
  902. @@ -3,7 +3,7 @@
  903. * nimf-libhangul.c
  904. * This file is part of Nimf.
  905. *
  906. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  907. + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  908. *
  909. * Nimf is free software: you can redistribute it and/or modify it
  910. * under the terms of the GNU Lesser General Public License as published
  911. @@ -47,7 +47,7 @@ struct _NimfLibhangul
  912. NimfKey **hanja_keys;
  913. GSettings *settings;
  914. gboolean is_double_consonant_rule;
  915. - gboolean is_auto_reordering;
  916. + gboolean auto_reordering;
  917. gchar *method;
  918. /* workaround: ignore reset called by commit callback in application */
  919. gboolean ignore_reset_in_commit_cb;
  920. @@ -612,35 +612,36 @@ nimf_libhangul_filter_event (NimfEngine *engine,
  921. gchar *new_preedit = g_ucs4_to_utf8 (ucs_preedit, -1, NULL, NULL, NULL);
  922. nimf_libhangul_update_preedit (engine, target, new_preedit);
  923. - return retval;
  924. -}
  925. -
  926. -static bool
  927. -on_libhangul_transition (HangulInputContext *ic,
  928. - ucschar c,
  929. - const ucschar *preedit,
  930. - void *data)
  931. -{
  932. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  933. -
  934. - if ((hangul_is_choseong (c) && (hangul_ic_has_jungseong (ic) ||
  935. - hangul_ic_has_jongseong (ic))) ||
  936. - (hangul_is_jungseong (c) && hangul_ic_has_jongseong (ic)))
  937. - return false;
  938. -
  939. - return true;
  940. -}
  941. -
  942. -static void
  943. -nimf_libhangul_update_transition_cb (NimfLibhangul *hangul)
  944. -{
  945. - g_debug (G_STRLOC ": %s", G_STRFUNC);
  946. + if (!retval)
  947. + {
  948. + switch (keyval)
  949. + {
  950. + case '_':
  951. + case '-':
  952. + case '+':
  953. + case '=':
  954. + case '{':
  955. + case '[':
  956. + case '}':
  957. + case ']':
  958. + case ':':
  959. + case ';':
  960. + case '\"':
  961. + case '\'':
  962. + case '<':
  963. + case ',':
  964. + case '>':
  965. + case '.':
  966. + case '?':
  967. + case '/':
  968. + nimf_libhangul_emit_commit (engine, target, (char *) &keyval);
  969. + retval = TRUE;
  970. + default:
  971. + break;
  972. + }
  973. + }
  974. - if ((g_strcmp0 (hangul->method, "2") == 0) && !hangul->is_auto_reordering)
  975. - hangul_ic_connect_callback (hangul->context, "transition",
  976. - on_libhangul_transition, NULL);
  977. - else
  978. - hangul_ic_connect_callback (hangul->context, "transition", NULL, NULL);
  979. + return retval;
  980. }
  981. static void
  982. @@ -653,7 +654,8 @@ on_changed_method (GSettings *settings,
  983. g_free (hangul->method);
  984. hangul->method = g_settings_get_string (settings, key);
  985. hangul_ic_select_keyboard (hangul->context, hangul->method);
  986. - nimf_libhangul_update_transition_cb (hangul);
  987. + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
  988. + hangul->auto_reordering);
  989. }
  990. static void
  991. @@ -663,8 +665,9 @@ on_changed_auto_reordering (GSettings *settings,
  992. {
  993. g_debug (G_STRLOC ": %s", G_STRFUNC);
  994. - hangul->is_auto_reordering = g_settings_get_boolean (settings, key);
  995. - nimf_libhangul_update_transition_cb (hangul);
  996. + hangul->auto_reordering = g_settings_get_boolean (settings, key);
  997. + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
  998. + hangul->auto_reordering);
  999. }
  1000. static void
  1001. @@ -716,7 +719,7 @@ nimf_libhangul_init (NimfLibhangul *hangul)
  1002. hangul->method = g_settings_get_string (hangul->settings, "get-method-infos");
  1003. hangul->is_double_consonant_rule =
  1004. g_settings_get_boolean (hangul->settings, "double-consonant-rule");
  1005. - hangul->is_auto_reordering =
  1006. + hangul->auto_reordering =
  1007. g_settings_get_boolean (hangul->settings, "auto-reordering");
  1008. hangul->ignore_reset_in_commit_cb =
  1009. g_settings_get_boolean (hangul->settings, "ignore-reset-in-commit-cb");
  1010. @@ -741,18 +744,19 @@ nimf_libhangul_init (NimfLibhangul *hangul)
  1011. g_strfreev (hanja_keys);
  1012. - nimf_libhangul_update_transition_cb (hangul);
  1013. -
  1014. - g_signal_connect (hangul->settings, "changed::get-method-infos",
  1015. - G_CALLBACK (on_changed_method), hangul);
  1016. - g_signal_connect (hangul->settings, "changed::hanja-keys",
  1017. - G_CALLBACK (on_changed_keys), hangul);
  1018. - g_signal_connect (hangul->settings, "changed::double-consonant-rule",
  1019. - G_CALLBACK (on_changed_double_consonant_rule), hangul);
  1020. - g_signal_connect (hangul->settings, "changed::auto-reordering",
  1021. - G_CALLBACK (on_changed_auto_reordering), hangul);
  1022. - g_signal_connect (hangul->settings, "changed::ignore-reset-in-commit-cb",
  1023. - G_CALLBACK (on_changed_ignore_reset_in_commit_cb), hangul);
  1024. + hangul_ic_set_option (hangul->context, HANGUL_IC_OPTION_AUTO_REORDER,
  1025. + hangul->auto_reordering);
  1026. +
  1027. + g_signal_connect_data (hangul->settings, "changed::get-method-infos",
  1028. + G_CALLBACK (on_changed_method), hangul, NULL, G_CONNECT_AFTER);
  1029. + g_signal_connect_data (hangul->settings, "changed::hanja-keys",
  1030. + G_CALLBACK (on_changed_keys), hangul, NULL, G_CONNECT_AFTER);
  1031. + g_signal_connect_data (hangul->settings, "changed::double-consonant-rule",
  1032. + G_CALLBACK (on_changed_double_consonant_rule), hangul, NULL, G_CONNECT_AFTER);
  1033. + g_signal_connect_data (hangul->settings, "changed::auto-reordering",
  1034. + G_CALLBACK (on_changed_auto_reordering), hangul, NULL, G_CONNECT_AFTER);
  1035. + g_signal_connect_data (hangul->settings, "changed::ignore-reset-in-commit-cb",
  1036. + G_CALLBACK (on_changed_ignore_reset_in_commit_cb), hangul, NULL, G_CONNECT_AFTER);
  1037. }
  1038. static void
  1039. diff --git a/modules/engines/nimf-m17n/nimf-m17n-am.c b/modules/engines/nimf-m17n/nimf-m17n-am.c
  1040. index 02c1a3b..2d56766 100644
  1041. --- a/modules/engines/nimf-m17n/nimf-m17n-am.c
  1042. +++ b/modules/engines/nimf-m17n/nimf-m17n-am.c
  1043. @@ -3,7 +3,7 @@
  1044. * nimf-m17n-am.c
  1045. * This file is part of Nimf.
  1046. *
  1047. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1048. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1049. *
  1050. * Nimf is free software: you can redistribute it and/or modify it
  1051. * under the terms of the GNU Lesser General Public License as published
  1052. @@ -58,8 +58,8 @@ nimf_m17n_am_init (NimfM17nAm *am)
  1053. nimf_m17n_open_im (m17n);
  1054. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1055. - G_CALLBACK (on_changed_method), m17n);
  1056. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1057. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1058. }
  1059. static void
  1060. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ar.c b/modules/engines/nimf-m17n/nimf-m17n-ar.c
  1061. index 24232b6..7e2b636 100644
  1062. --- a/modules/engines/nimf-m17n/nimf-m17n-ar.c
  1063. +++ b/modules/engines/nimf-m17n/nimf-m17n-ar.c
  1064. @@ -3,7 +3,7 @@
  1065. * nimf-m17n-ar.c
  1066. * This file is part of Nimf.
  1067. *
  1068. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1069. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1070. *
  1071. * Nimf is free software: you can redistribute it and/or modify it
  1072. * under the terms of the GNU Lesser General Public License as published
  1073. @@ -58,8 +58,8 @@ nimf_m17n_ar_init (NimfM17nAr *ar)
  1074. nimf_m17n_open_im (m17n);
  1075. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1076. - G_CALLBACK (on_changed_method), m17n);
  1077. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1078. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1079. }
  1080. static void
  1081. diff --git a/modules/engines/nimf-m17n/nimf-m17n-as.c b/modules/engines/nimf-m17n/nimf-m17n-as.c
  1082. index 339257e..0f6fbca 100644
  1083. --- a/modules/engines/nimf-m17n/nimf-m17n-as.c
  1084. +++ b/modules/engines/nimf-m17n/nimf-m17n-as.c
  1085. @@ -3,7 +3,7 @@
  1086. * nimf-m17n-as.c
  1087. * This file is part of Nimf.
  1088. *
  1089. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1090. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1091. *
  1092. * Nimf is free software: you can redistribute it and/or modify it
  1093. * under the terms of the GNU Lesser General Public License as published
  1094. @@ -58,8 +58,8 @@ nimf_m17n_as_init (NimfM17nAs *as)
  1095. nimf_m17n_open_im (m17n);
  1096. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1097. - G_CALLBACK (on_changed_method), m17n);
  1098. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1099. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1100. }
  1101. static void
  1102. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ath.c b/modules/engines/nimf-m17n/nimf-m17n-ath.c
  1103. index 405926f..a771f1b 100644
  1104. --- a/modules/engines/nimf-m17n/nimf-m17n-ath.c
  1105. +++ b/modules/engines/nimf-m17n/nimf-m17n-ath.c
  1106. @@ -3,7 +3,7 @@
  1107. * nimf-m17n-ath.c
  1108. * This file is part of Nimf.
  1109. *
  1110. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1111. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1112. *
  1113. * Nimf is free software: you can redistribute it and/or modify it
  1114. * under the terms of the GNU Lesser General Public License as published
  1115. @@ -58,8 +58,8 @@ nimf_m17n_ath_init (NimfM17nAth *ath)
  1116. nimf_m17n_open_im (m17n);
  1117. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1118. - G_CALLBACK (on_changed_method), m17n);
  1119. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1120. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1121. }
  1122. static void
  1123. diff --git a/modules/engines/nimf-m17n/nimf-m17n-be.c b/modules/engines/nimf-m17n/nimf-m17n-be.c
  1124. index feee9fa..2491e12 100644
  1125. --- a/modules/engines/nimf-m17n/nimf-m17n-be.c
  1126. +++ b/modules/engines/nimf-m17n/nimf-m17n-be.c
  1127. @@ -3,7 +3,7 @@
  1128. * nimf-m17n-be.c
  1129. * This file is part of Nimf.
  1130. *
  1131. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1132. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1133. *
  1134. * Nimf is free software: you can redistribute it and/or modify it
  1135. * under the terms of the GNU Lesser General Public License as published
  1136. @@ -58,8 +58,8 @@ nimf_m17n_be_init (NimfM17nBe *be)
  1137. nimf_m17n_open_im (m17n);
  1138. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1139. - G_CALLBACK (on_changed_method), m17n);
  1140. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1141. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1142. }
  1143. static void
  1144. diff --git a/modules/engines/nimf-m17n/nimf-m17n-bla.c b/modules/engines/nimf-m17n/nimf-m17n-bla.c
  1145. index 4e4bbe0..65ab4d7 100644
  1146. --- a/modules/engines/nimf-m17n/nimf-m17n-bla.c
  1147. +++ b/modules/engines/nimf-m17n/nimf-m17n-bla.c
  1148. @@ -3,7 +3,7 @@
  1149. * nimf-m17n-bla.c
  1150. * This file is part of Nimf.
  1151. *
  1152. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1153. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1154. *
  1155. * Nimf is free software: you can redistribute it and/or modify it
  1156. * under the terms of the GNU Lesser General Public License as published
  1157. @@ -58,8 +58,8 @@ nimf_m17n_bla_init (NimfM17nBla *bla)
  1158. nimf_m17n_open_im (m17n);
  1159. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1160. - G_CALLBACK (on_changed_method), m17n);
  1161. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1162. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1163. }
  1164. static void
  1165. diff --git a/modules/engines/nimf-m17n/nimf-m17n-bn.c b/modules/engines/nimf-m17n/nimf-m17n-bn.c
  1166. index 7f54253..9cdaeab 100644
  1167. --- a/modules/engines/nimf-m17n/nimf-m17n-bn.c
  1168. +++ b/modules/engines/nimf-m17n/nimf-m17n-bn.c
  1169. @@ -3,7 +3,7 @@
  1170. * nimf-m17n-bn.c
  1171. * This file is part of Nimf.
  1172. *
  1173. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1174. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1175. *
  1176. * Nimf is free software: you can redistribute it and/or modify it
  1177. * under the terms of the GNU Lesser General Public License as published
  1178. @@ -58,8 +58,8 @@ nimf_m17n_bn_init (NimfM17nBn *bn)
  1179. nimf_m17n_open_im (m17n);
  1180. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1181. - G_CALLBACK (on_changed_method), m17n);
  1182. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1183. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1184. }
  1185. static void
  1186. diff --git a/modules/engines/nimf-m17n/nimf-m17n-bo.c b/modules/engines/nimf-m17n/nimf-m17n-bo.c
  1187. index 0735648..88ace0b 100644
  1188. --- a/modules/engines/nimf-m17n/nimf-m17n-bo.c
  1189. +++ b/modules/engines/nimf-m17n/nimf-m17n-bo.c
  1190. @@ -3,7 +3,7 @@
  1191. * nimf-m17n-bo.c
  1192. * This file is part of Nimf.
  1193. *
  1194. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1195. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1196. *
  1197. * Nimf is free software: you can redistribute it and/or modify it
  1198. * under the terms of the GNU Lesser General Public License as published
  1199. @@ -58,8 +58,8 @@ nimf_m17n_bo_init (NimfM17nBo *bo)
  1200. nimf_m17n_open_im (m17n);
  1201. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1202. - G_CALLBACK (on_changed_method), m17n);
  1203. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1204. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1205. }
  1206. static void
  1207. diff --git a/modules/engines/nimf-m17n/nimf-m17n-cmc.c b/modules/engines/nimf-m17n/nimf-m17n-cmc.c
  1208. index 961af02..e1659d5 100644
  1209. --- a/modules/engines/nimf-m17n/nimf-m17n-cmc.c
  1210. +++ b/modules/engines/nimf-m17n/nimf-m17n-cmc.c
  1211. @@ -3,7 +3,7 @@
  1212. * nimf-m17n-cmc.c
  1213. * This file is part of Nimf.
  1214. *
  1215. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1216. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1217. *
  1218. * Nimf is free software: you can redistribute it and/or modify it
  1219. * under the terms of the GNU Lesser General Public License as published
  1220. @@ -58,8 +58,8 @@ nimf_m17n_cmc_init (NimfM17nCmc *cmc)
  1221. nimf_m17n_open_im (m17n);
  1222. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1223. - G_CALLBACK (on_changed_method), m17n);
  1224. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1225. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1226. }
  1227. static void
  1228. diff --git a/modules/engines/nimf-m17n/nimf-m17n-cr.c b/modules/engines/nimf-m17n/nimf-m17n-cr.c
  1229. index f7e2a28..a3916d1 100644
  1230. --- a/modules/engines/nimf-m17n/nimf-m17n-cr.c
  1231. +++ b/modules/engines/nimf-m17n/nimf-m17n-cr.c
  1232. @@ -3,7 +3,7 @@
  1233. * nimf-m17n-cr.c
  1234. * This file is part of Nimf.
  1235. *
  1236. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1237. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1238. *
  1239. * Nimf is free software: you can redistribute it and/or modify it
  1240. * under the terms of the GNU Lesser General Public License as published
  1241. @@ -58,8 +58,8 @@ nimf_m17n_cr_init (NimfM17nCr *cr)
  1242. nimf_m17n_open_im (m17n);
  1243. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1244. - G_CALLBACK (on_changed_method), m17n);
  1245. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1246. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1247. }
  1248. static void
  1249. diff --git a/modules/engines/nimf-m17n/nimf-m17n-cs.c b/modules/engines/nimf-m17n/nimf-m17n-cs.c
  1250. index 5949142..44a5b0e 100644
  1251. --- a/modules/engines/nimf-m17n/nimf-m17n-cs.c
  1252. +++ b/modules/engines/nimf-m17n/nimf-m17n-cs.c
  1253. @@ -3,7 +3,7 @@
  1254. * nimf-m17n-cs.c
  1255. * This file is part of Nimf.
  1256. *
  1257. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1258. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1259. *
  1260. * Nimf is free software: you can redistribute it and/or modify it
  1261. * under the terms of the GNU Lesser General Public License as published
  1262. @@ -58,8 +58,8 @@ nimf_m17n_cs_init (NimfM17nCs *cs)
  1263. nimf_m17n_open_im (m17n);
  1264. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1265. - G_CALLBACK (on_changed_method), m17n);
  1266. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1267. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1268. }
  1269. static void
  1270. diff --git a/modules/engines/nimf-m17n/nimf-m17n-da.c b/modules/engines/nimf-m17n/nimf-m17n-da.c
  1271. index 1e69f53..70c684e 100644
  1272. --- a/modules/engines/nimf-m17n/nimf-m17n-da.c
  1273. +++ b/modules/engines/nimf-m17n/nimf-m17n-da.c
  1274. @@ -3,7 +3,7 @@
  1275. * nimf-m17n-da.c
  1276. * This file is part of Nimf.
  1277. *
  1278. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1279. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1280. *
  1281. * Nimf is free software: you can redistribute it and/or modify it
  1282. * under the terms of the GNU Lesser General Public License as published
  1283. @@ -58,8 +58,8 @@ nimf_m17n_da_init (NimfM17nDa *da)
  1284. nimf_m17n_open_im (m17n);
  1285. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1286. - G_CALLBACK (on_changed_method), m17n);
  1287. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1288. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1289. }
  1290. static void
  1291. diff --git a/modules/engines/nimf-m17n/nimf-m17n-dv.c b/modules/engines/nimf-m17n/nimf-m17n-dv.c
  1292. index 4b07a4a..bb9430a 100644
  1293. --- a/modules/engines/nimf-m17n/nimf-m17n-dv.c
  1294. +++ b/modules/engines/nimf-m17n/nimf-m17n-dv.c
  1295. @@ -3,7 +3,7 @@
  1296. * nimf-m17n-dv.c
  1297. * This file is part of Nimf.
  1298. *
  1299. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1300. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1301. *
  1302. * Nimf is free software: you can redistribute it and/or modify it
  1303. * under the terms of the GNU Lesser General Public License as published
  1304. @@ -58,8 +58,8 @@ nimf_m17n_dv_init (NimfM17nDv *dv)
  1305. nimf_m17n_open_im (m17n);
  1306. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1307. - G_CALLBACK (on_changed_method), m17n);
  1308. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1309. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1310. }
  1311. static void
  1312. diff --git a/modules/engines/nimf-m17n/nimf-m17n-el.c b/modules/engines/nimf-m17n/nimf-m17n-el.c
  1313. index 408b010..5fc3cbc 100644
  1314. --- a/modules/engines/nimf-m17n/nimf-m17n-el.c
  1315. +++ b/modules/engines/nimf-m17n/nimf-m17n-el.c
  1316. @@ -3,7 +3,7 @@
  1317. * nimf-m17n-el.c
  1318. * This file is part of Nimf.
  1319. *
  1320. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1321. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1322. *
  1323. * Nimf is free software: you can redistribute it and/or modify it
  1324. * under the terms of the GNU Lesser General Public License as published
  1325. @@ -58,8 +58,8 @@ nimf_m17n_el_init (NimfM17nEl *el)
  1326. nimf_m17n_open_im (m17n);
  1327. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1328. - G_CALLBACK (on_changed_method), m17n);
  1329. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1330. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1331. }
  1332. static void
  1333. diff --git a/modules/engines/nimf-m17n/nimf-m17n-eo.c b/modules/engines/nimf-m17n/nimf-m17n-eo.c
  1334. index a411c16..082456c 100644
  1335. --- a/modules/engines/nimf-m17n/nimf-m17n-eo.c
  1336. +++ b/modules/engines/nimf-m17n/nimf-m17n-eo.c
  1337. @@ -3,7 +3,7 @@
  1338. * nimf-m17n-eo.c
  1339. * This file is part of Nimf.
  1340. *
  1341. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1342. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1343. *
  1344. * Nimf is free software: you can redistribute it and/or modify it
  1345. * under the terms of the GNU Lesser General Public License as published
  1346. @@ -58,8 +58,8 @@ nimf_m17n_eo_init (NimfM17nEo *eo)
  1347. nimf_m17n_open_im (m17n);
  1348. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1349. - G_CALLBACK (on_changed_method), m17n);
  1350. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1351. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1352. }
  1353. static void
  1354. diff --git a/modules/engines/nimf-m17n/nimf-m17n-fa.c b/modules/engines/nimf-m17n/nimf-m17n-fa.c
  1355. index 59676e4..e36ba7c 100644
  1356. --- a/modules/engines/nimf-m17n/nimf-m17n-fa.c
  1357. +++ b/modules/engines/nimf-m17n/nimf-m17n-fa.c
  1358. @@ -3,7 +3,7 @@
  1359. * nimf-m17n-fa.c
  1360. * This file is part of Nimf.
  1361. *
  1362. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1363. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1364. *
  1365. * Nimf is free software: you can redistribute it and/or modify it
  1366. * under the terms of the GNU Lesser General Public License as published
  1367. @@ -58,8 +58,8 @@ nimf_m17n_fa_init (NimfM17nFa *fa)
  1368. nimf_m17n_open_im (m17n);
  1369. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1370. - G_CALLBACK (on_changed_method), m17n);
  1371. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1372. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1373. }
  1374. static void
  1375. diff --git a/modules/engines/nimf-m17n/nimf-m17n-fr.c b/modules/engines/nimf-m17n/nimf-m17n-fr.c
  1376. index c431495..53db099 100644
  1377. --- a/modules/engines/nimf-m17n/nimf-m17n-fr.c
  1378. +++ b/modules/engines/nimf-m17n/nimf-m17n-fr.c
  1379. @@ -3,7 +3,7 @@
  1380. * nimf-m17n-fr.c
  1381. * This file is part of Nimf.
  1382. *
  1383. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1384. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1385. *
  1386. * Nimf is free software: you can redistribute it and/or modify it
  1387. * under the terms of the GNU Lesser General Public License as published
  1388. @@ -58,8 +58,8 @@ nimf_m17n_fr_init (NimfM17nFr *fr)
  1389. nimf_m17n_open_im (m17n);
  1390. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1391. - G_CALLBACK (on_changed_method), m17n);
  1392. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1393. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1394. }
  1395. static void
  1396. diff --git a/modules/engines/nimf-m17n/nimf-m17n-grc.c b/modules/engines/nimf-m17n/nimf-m17n-grc.c
  1397. index d66c3c7..142d989 100644
  1398. --- a/modules/engines/nimf-m17n/nimf-m17n-grc.c
  1399. +++ b/modules/engines/nimf-m17n/nimf-m17n-grc.c
  1400. @@ -3,7 +3,7 @@
  1401. * nimf-m17n-grc.c
  1402. * This file is part of Nimf.
  1403. *
  1404. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1405. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1406. *
  1407. * Nimf is free software: you can redistribute it and/or modify it
  1408. * under the terms of the GNU Lesser General Public License as published
  1409. @@ -58,8 +58,8 @@ nimf_m17n_grc_init (NimfM17nGrc *grc)
  1410. nimf_m17n_open_im (m17n);
  1411. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1412. - G_CALLBACK (on_changed_method), m17n);
  1413. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1414. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1415. }
  1416. static void
  1417. diff --git a/modules/engines/nimf-m17n/nimf-m17n-gu.c b/modules/engines/nimf-m17n/nimf-m17n-gu.c
  1418. index 69f8dd6..9c6aecc 100644
  1419. --- a/modules/engines/nimf-m17n/nimf-m17n-gu.c
  1420. +++ b/modules/engines/nimf-m17n/nimf-m17n-gu.c
  1421. @@ -3,7 +3,7 @@
  1422. * nimf-m17n-gu.c
  1423. * This file is part of Nimf.
  1424. *
  1425. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1426. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1427. *
  1428. * Nimf is free software: you can redistribute it and/or modify it
  1429. * under the terms of the GNU Lesser General Public License as published
  1430. @@ -58,8 +58,8 @@ nimf_m17n_gu_init (NimfM17nGu *gu)
  1431. nimf_m17n_open_im (m17n);
  1432. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1433. - G_CALLBACK (on_changed_method), m17n);
  1434. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1435. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1436. }
  1437. static void
  1438. diff --git a/modules/engines/nimf-m17n/nimf-m17n-he.c b/modules/engines/nimf-m17n/nimf-m17n-he.c
  1439. index a273d63..a682e1d 100644
  1440. --- a/modules/engines/nimf-m17n/nimf-m17n-he.c
  1441. +++ b/modules/engines/nimf-m17n/nimf-m17n-he.c
  1442. @@ -3,7 +3,7 @@
  1443. * nimf-m17n-he.c
  1444. * This file is part of Nimf.
  1445. *
  1446. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1447. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1448. *
  1449. * Nimf is free software: you can redistribute it and/or modify it
  1450. * under the terms of the GNU Lesser General Public License as published
  1451. @@ -58,8 +58,8 @@ nimf_m17n_he_init (NimfM17nHe *he)
  1452. nimf_m17n_open_im (m17n);
  1453. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1454. - G_CALLBACK (on_changed_method), m17n);
  1455. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1456. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1457. }
  1458. static void
  1459. diff --git a/modules/engines/nimf-m17n/nimf-m17n-hi.c b/modules/engines/nimf-m17n/nimf-m17n-hi.c
  1460. index 03b275b..87a1fc4 100644
  1461. --- a/modules/engines/nimf-m17n/nimf-m17n-hi.c
  1462. +++ b/modules/engines/nimf-m17n/nimf-m17n-hi.c
  1463. @@ -3,7 +3,7 @@
  1464. * nimf-m17n-hi.c
  1465. * This file is part of Nimf.
  1466. *
  1467. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1468. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1469. *
  1470. * Nimf is free software: you can redistribute it and/or modify it
  1471. * under the terms of the GNU Lesser General Public License as published
  1472. @@ -58,8 +58,8 @@ nimf_m17n_hi_init (NimfM17nHi *hi)
  1473. nimf_m17n_open_im (m17n);
  1474. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1475. - G_CALLBACK (on_changed_method), m17n);
  1476. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1477. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1478. }
  1479. static void
  1480. diff --git a/modules/engines/nimf-m17n/nimf-m17n-hr.c b/modules/engines/nimf-m17n/nimf-m17n-hr.c
  1481. index fa49741..b799073 100644
  1482. --- a/modules/engines/nimf-m17n/nimf-m17n-hr.c
  1483. +++ b/modules/engines/nimf-m17n/nimf-m17n-hr.c
  1484. @@ -3,7 +3,7 @@
  1485. * nimf-m17n-hr.c
  1486. * This file is part of Nimf.
  1487. *
  1488. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1489. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1490. *
  1491. * Nimf is free software: you can redistribute it and/or modify it
  1492. * under the terms of the GNU Lesser General Public License as published
  1493. @@ -58,8 +58,8 @@ nimf_m17n_hr_init (NimfM17nHr *hr)
  1494. nimf_m17n_open_im (m17n);
  1495. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1496. - G_CALLBACK (on_changed_method), m17n);
  1497. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1498. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1499. }
  1500. static void
  1501. diff --git a/modules/engines/nimf-m17n/nimf-m17n-hu.c b/modules/engines/nimf-m17n/nimf-m17n-hu.c
  1502. index a168a7e..d09fb95 100644
  1503. --- a/modules/engines/nimf-m17n/nimf-m17n-hu.c
  1504. +++ b/modules/engines/nimf-m17n/nimf-m17n-hu.c
  1505. @@ -3,7 +3,7 @@
  1506. * nimf-m17n-hu.c
  1507. * This file is part of Nimf.
  1508. *
  1509. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1510. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1511. *
  1512. * Nimf is free software: you can redistribute it and/or modify it
  1513. * under the terms of the GNU Lesser General Public License as published
  1514. @@ -58,8 +58,8 @@ nimf_m17n_hu_init (NimfM17nHu *hu)
  1515. nimf_m17n_open_im (m17n);
  1516. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1517. - G_CALLBACK (on_changed_method), m17n);
  1518. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1519. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1520. }
  1521. static void
  1522. diff --git a/modules/engines/nimf-m17n/nimf-m17n-hy.c b/modules/engines/nimf-m17n/nimf-m17n-hy.c
  1523. index 9daf653..6c81b7b 100644
  1524. --- a/modules/engines/nimf-m17n/nimf-m17n-hy.c
  1525. +++ b/modules/engines/nimf-m17n/nimf-m17n-hy.c
  1526. @@ -3,7 +3,7 @@
  1527. * nimf-m17n-hy.c
  1528. * This file is part of Nimf.
  1529. *
  1530. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1531. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1532. *
  1533. * Nimf is free software: you can redistribute it and/or modify it
  1534. * under the terms of the GNU Lesser General Public License as published
  1535. @@ -58,8 +58,8 @@ nimf_m17n_hy_init (NimfM17nHy *hy)
  1536. nimf_m17n_open_im (m17n);
  1537. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1538. - G_CALLBACK (on_changed_method), m17n);
  1539. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1540. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1541. }
  1542. static void
  1543. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ii.c b/modules/engines/nimf-m17n/nimf-m17n-ii.c
  1544. index f678149..e5f3f30 100644
  1545. --- a/modules/engines/nimf-m17n/nimf-m17n-ii.c
  1546. +++ b/modules/engines/nimf-m17n/nimf-m17n-ii.c
  1547. @@ -3,7 +3,7 @@
  1548. * nimf-m17n-ii.c
  1549. * This file is part of Nimf.
  1550. *
  1551. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1552. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1553. *
  1554. * Nimf is free software: you can redistribute it and/or modify it
  1555. * under the terms of the GNU Lesser General Public License as published
  1556. @@ -58,8 +58,8 @@ nimf_m17n_ii_init (NimfM17nIi *ii)
  1557. nimf_m17n_open_im (m17n);
  1558. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1559. - G_CALLBACK (on_changed_method), m17n);
  1560. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1561. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1562. }
  1563. static void
  1564. diff --git a/modules/engines/nimf-m17n/nimf-m17n-iu.c b/modules/engines/nimf-m17n/nimf-m17n-iu.c
  1565. index 8c443fa..65d6e09 100644
  1566. --- a/modules/engines/nimf-m17n/nimf-m17n-iu.c
  1567. +++ b/modules/engines/nimf-m17n/nimf-m17n-iu.c
  1568. @@ -3,7 +3,7 @@
  1569. * nimf-m17n-iu.c
  1570. * This file is part of Nimf.
  1571. *
  1572. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1573. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1574. *
  1575. * Nimf is free software: you can redistribute it and/or modify it
  1576. * under the terms of the GNU Lesser General Public License as published
  1577. @@ -58,8 +58,8 @@ nimf_m17n_iu_init (NimfM17nIu *iu)
  1578. nimf_m17n_open_im (m17n);
  1579. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1580. - G_CALLBACK (on_changed_method), m17n);
  1581. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1582. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1583. }
  1584. static void
  1585. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ka.c b/modules/engines/nimf-m17n/nimf-m17n-ka.c
  1586. index 27757a1..be60e37 100644
  1587. --- a/modules/engines/nimf-m17n/nimf-m17n-ka.c
  1588. +++ b/modules/engines/nimf-m17n/nimf-m17n-ka.c
  1589. @@ -3,7 +3,7 @@
  1590. * nimf-m17n-ka.c
  1591. * This file is part of Nimf.
  1592. *
  1593. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1594. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1595. *
  1596. * Nimf is free software: you can redistribute it and/or modify it
  1597. * under the terms of the GNU Lesser General Public License as published
  1598. @@ -58,8 +58,8 @@ nimf_m17n_ka_init (NimfM17nKa *ka)
  1599. nimf_m17n_open_im (m17n);
  1600. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1601. - G_CALLBACK (on_changed_method), m17n);
  1602. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1603. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1604. }
  1605. static void
  1606. diff --git a/modules/engines/nimf-m17n/nimf-m17n-kk.c b/modules/engines/nimf-m17n/nimf-m17n-kk.c
  1607. index 2cf7e9a..92480d1 100644
  1608. --- a/modules/engines/nimf-m17n/nimf-m17n-kk.c
  1609. +++ b/modules/engines/nimf-m17n/nimf-m17n-kk.c
  1610. @@ -3,7 +3,7 @@
  1611. * nimf-m17n-kk.c
  1612. * This file is part of Nimf.
  1613. *
  1614. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1615. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1616. *
  1617. * Nimf is free software: you can redistribute it and/or modify it
  1618. * under the terms of the GNU Lesser General Public License as published
  1619. @@ -58,8 +58,8 @@ nimf_m17n_kk_init (NimfM17nKk *kk)
  1620. nimf_m17n_open_im (m17n);
  1621. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1622. - G_CALLBACK (on_changed_method), m17n);
  1623. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1624. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1625. }
  1626. static void
  1627. diff --git a/modules/engines/nimf-m17n/nimf-m17n-km.c b/modules/engines/nimf-m17n/nimf-m17n-km.c
  1628. index 25afedd..a442d72 100644
  1629. --- a/modules/engines/nimf-m17n/nimf-m17n-km.c
  1630. +++ b/modules/engines/nimf-m17n/nimf-m17n-km.c
  1631. @@ -3,7 +3,7 @@
  1632. * nimf-m17n-km.c
  1633. * This file is part of Nimf.
  1634. *
  1635. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1636. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1637. *
  1638. * Nimf is free software: you can redistribute it and/or modify it
  1639. * under the terms of the GNU Lesser General Public License as published
  1640. @@ -58,8 +58,8 @@ nimf_m17n_km_init (NimfM17nKm *km)
  1641. nimf_m17n_open_im (m17n);
  1642. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1643. - G_CALLBACK (on_changed_method), m17n);
  1644. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1645. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1646. }
  1647. static void
  1648. diff --git a/modules/engines/nimf-m17n/nimf-m17n-kn.c b/modules/engines/nimf-m17n/nimf-m17n-kn.c
  1649. index 5d31c4c..ce11568 100644
  1650. --- a/modules/engines/nimf-m17n/nimf-m17n-kn.c
  1651. +++ b/modules/engines/nimf-m17n/nimf-m17n-kn.c
  1652. @@ -3,7 +3,7 @@
  1653. * nimf-m17n-kn.c
  1654. * This file is part of Nimf.
  1655. *
  1656. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1657. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1658. *
  1659. * Nimf is free software: you can redistribute it and/or modify it
  1660. * under the terms of the GNU Lesser General Public License as published
  1661. @@ -58,8 +58,8 @@ nimf_m17n_kn_init (NimfM17nKn *kn)
  1662. nimf_m17n_open_im (m17n);
  1663. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1664. - G_CALLBACK (on_changed_method), m17n);
  1665. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1666. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1667. }
  1668. static void
  1669. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ks.c b/modules/engines/nimf-m17n/nimf-m17n-ks.c
  1670. index 372a1ed..e834cbe 100644
  1671. --- a/modules/engines/nimf-m17n/nimf-m17n-ks.c
  1672. +++ b/modules/engines/nimf-m17n/nimf-m17n-ks.c
  1673. @@ -3,7 +3,7 @@
  1674. * nimf-m17n-ks.c
  1675. * This file is part of Nimf.
  1676. *
  1677. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1678. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1679. *
  1680. * Nimf is free software: you can redistribute it and/or modify it
  1681. * under the terms of the GNU Lesser General Public License as published
  1682. @@ -58,8 +58,8 @@ nimf_m17n_ks_init (NimfM17nKs *ks)
  1683. nimf_m17n_open_im (m17n);
  1684. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1685. - G_CALLBACK (on_changed_method), m17n);
  1686. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1687. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1688. }
  1689. static void
  1690. diff --git a/modules/engines/nimf-m17n/nimf-m17n-lo.c b/modules/engines/nimf-m17n/nimf-m17n-lo.c
  1691. index b410955..50d8666 100644
  1692. --- a/modules/engines/nimf-m17n/nimf-m17n-lo.c
  1693. +++ b/modules/engines/nimf-m17n/nimf-m17n-lo.c
  1694. @@ -3,7 +3,7 @@
  1695. * nimf-m17n-lo.c
  1696. * This file is part of Nimf.
  1697. *
  1698. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1699. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1700. *
  1701. * Nimf is free software: you can redistribute it and/or modify it
  1702. * under the terms of the GNU Lesser General Public License as published
  1703. @@ -58,8 +58,8 @@ nimf_m17n_lo_init (NimfM17nLo *lo)
  1704. nimf_m17n_open_im (m17n);
  1705. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1706. - G_CALLBACK (on_changed_method), m17n);
  1707. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1708. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1709. }
  1710. static void
  1711. diff --git a/modules/engines/nimf-m17n/nimf-m17n-mai.c b/modules/engines/nimf-m17n/nimf-m17n-mai.c
  1712. index 263cbf8..017a882 100644
  1713. --- a/modules/engines/nimf-m17n/nimf-m17n-mai.c
  1714. +++ b/modules/engines/nimf-m17n/nimf-m17n-mai.c
  1715. @@ -3,7 +3,7 @@
  1716. * nimf-m17n-mai.c
  1717. * This file is part of Nimf.
  1718. *
  1719. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1720. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1721. *
  1722. * Nimf is free software: you can redistribute it and/or modify it
  1723. * under the terms of the GNU Lesser General Public License as published
  1724. @@ -58,8 +58,8 @@ nimf_m17n_mai_init (NimfM17nMai *mai)
  1725. nimf_m17n_open_im (m17n);
  1726. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1727. - G_CALLBACK (on_changed_method), m17n);
  1728. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1729. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1730. }
  1731. static void
  1732. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ml.c b/modules/engines/nimf-m17n/nimf-m17n-ml.c
  1733. index ee4687c..f0fd8a9 100644
  1734. --- a/modules/engines/nimf-m17n/nimf-m17n-ml.c
  1735. +++ b/modules/engines/nimf-m17n/nimf-m17n-ml.c
  1736. @@ -3,7 +3,7 @@
  1737. * nimf-m17n-ml.c
  1738. * This file is part of Nimf.
  1739. *
  1740. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1741. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1742. *
  1743. * Nimf is free software: you can redistribute it and/or modify it
  1744. * under the terms of the GNU Lesser General Public License as published
  1745. @@ -58,8 +58,8 @@ nimf_m17n_ml_init (NimfM17nMl *ml)
  1746. nimf_m17n_open_im (m17n);
  1747. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1748. - G_CALLBACK (on_changed_method), m17n);
  1749. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1750. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1751. }
  1752. static void
  1753. diff --git a/modules/engines/nimf-m17n/nimf-m17n-mr.c b/modules/engines/nimf-m17n/nimf-m17n-mr.c
  1754. index 575d644..33ccde8 100644
  1755. --- a/modules/engines/nimf-m17n/nimf-m17n-mr.c
  1756. +++ b/modules/engines/nimf-m17n/nimf-m17n-mr.c
  1757. @@ -3,7 +3,7 @@
  1758. * nimf-m17n-mr.c
  1759. * This file is part of Nimf.
  1760. *
  1761. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1762. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1763. *
  1764. * Nimf is free software: you can redistribute it and/or modify it
  1765. * under the terms of the GNU Lesser General Public License as published
  1766. @@ -58,8 +58,8 @@ nimf_m17n_mr_init (NimfM17nMr *mr)
  1767. nimf_m17n_open_im (m17n);
  1768. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1769. - G_CALLBACK (on_changed_method), m17n);
  1770. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1771. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1772. }
  1773. static void
  1774. diff --git a/modules/engines/nimf-m17n/nimf-m17n-my.c b/modules/engines/nimf-m17n/nimf-m17n-my.c
  1775. index 39fb615..bfb01cf 100644
  1776. --- a/modules/engines/nimf-m17n/nimf-m17n-my.c
  1777. +++ b/modules/engines/nimf-m17n/nimf-m17n-my.c
  1778. @@ -3,7 +3,7 @@
  1779. * nimf-m17n-my.c
  1780. * This file is part of Nimf.
  1781. *
  1782. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1783. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1784. *
  1785. * Nimf is free software: you can redistribute it and/or modify it
  1786. * under the terms of the GNU Lesser General Public License as published
  1787. @@ -58,8 +58,8 @@ nimf_m17n_my_init (NimfM17nMy *my)
  1788. nimf_m17n_open_im (m17n);
  1789. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1790. - G_CALLBACK (on_changed_method), m17n);
  1791. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1792. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1793. }
  1794. static void
  1795. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ne.c b/modules/engines/nimf-m17n/nimf-m17n-ne.c
  1796. index 757086c..7679733 100644
  1797. --- a/modules/engines/nimf-m17n/nimf-m17n-ne.c
  1798. +++ b/modules/engines/nimf-m17n/nimf-m17n-ne.c
  1799. @@ -3,7 +3,7 @@
  1800. * nimf-m17n-ne.c
  1801. * This file is part of Nimf.
  1802. *
  1803. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1804. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1805. *
  1806. * Nimf is free software: you can redistribute it and/or modify it
  1807. * under the terms of the GNU Lesser General Public License as published
  1808. @@ -58,8 +58,8 @@ nimf_m17n_ne_init (NimfM17nNe *ne)
  1809. nimf_m17n_open_im (m17n);
  1810. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1811. - G_CALLBACK (on_changed_method), m17n);
  1812. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1813. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1814. }
  1815. static void
  1816. diff --git a/modules/engines/nimf-m17n/nimf-m17n-nsk.c b/modules/engines/nimf-m17n/nimf-m17n-nsk.c
  1817. index 95182f2..fae65d6 100644
  1818. --- a/modules/engines/nimf-m17n/nimf-m17n-nsk.c
  1819. +++ b/modules/engines/nimf-m17n/nimf-m17n-nsk.c
  1820. @@ -3,7 +3,7 @@
  1821. * nimf-m17n-nsk.c
  1822. * This file is part of Nimf.
  1823. *
  1824. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1825. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1826. *
  1827. * Nimf is free software: you can redistribute it and/or modify it
  1828. * under the terms of the GNU Lesser General Public License as published
  1829. @@ -58,8 +58,8 @@ nimf_m17n_nsk_init (NimfM17nNsk *nsk)
  1830. nimf_m17n_open_im (m17n);
  1831. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1832. - G_CALLBACK (on_changed_method), m17n);
  1833. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1834. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1835. }
  1836. static void
  1837. diff --git a/modules/engines/nimf-m17n/nimf-m17n-oj.c b/modules/engines/nimf-m17n/nimf-m17n-oj.c
  1838. index 51a6a5d..01a17b8 100644
  1839. --- a/modules/engines/nimf-m17n/nimf-m17n-oj.c
  1840. +++ b/modules/engines/nimf-m17n/nimf-m17n-oj.c
  1841. @@ -3,7 +3,7 @@
  1842. * nimf-m17n-oj.c
  1843. * This file is part of Nimf.
  1844. *
  1845. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1846. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1847. *
  1848. * Nimf is free software: you can redistribute it and/or modify it
  1849. * under the terms of the GNU Lesser General Public License as published
  1850. @@ -58,8 +58,8 @@ nimf_m17n_oj_init (NimfM17nOj *oj)
  1851. nimf_m17n_open_im (m17n);
  1852. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1853. - G_CALLBACK (on_changed_method), m17n);
  1854. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1855. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1856. }
  1857. static void
  1858. diff --git a/modules/engines/nimf-m17n/nimf-m17n-or.c b/modules/engines/nimf-m17n/nimf-m17n-or.c
  1859. index 47d4437..9f0652d 100644
  1860. --- a/modules/engines/nimf-m17n/nimf-m17n-or.c
  1861. +++ b/modules/engines/nimf-m17n/nimf-m17n-or.c
  1862. @@ -3,7 +3,7 @@
  1863. * nimf-m17n-or.c
  1864. * This file is part of Nimf.
  1865. *
  1866. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1867. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1868. *
  1869. * Nimf is free software: you can redistribute it and/or modify it
  1870. * under the terms of the GNU Lesser General Public License as published
  1871. @@ -58,8 +58,8 @@ nimf_m17n_or_init (NimfM17nOr *or)
  1872. nimf_m17n_open_im (m17n);
  1873. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1874. - G_CALLBACK (on_changed_method), m17n);
  1875. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1876. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1877. }
  1878. static void
  1879. diff --git a/modules/engines/nimf-m17n/nimf-m17n-pa.c b/modules/engines/nimf-m17n/nimf-m17n-pa.c
  1880. index 474b5b2..b798d01 100644
  1881. --- a/modules/engines/nimf-m17n/nimf-m17n-pa.c
  1882. +++ b/modules/engines/nimf-m17n/nimf-m17n-pa.c
  1883. @@ -3,7 +3,7 @@
  1884. * nimf-m17n-pa.c
  1885. * This file is part of Nimf.
  1886. *
  1887. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1888. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1889. *
  1890. * Nimf is free software: you can redistribute it and/or modify it
  1891. * under the terms of the GNU Lesser General Public License as published
  1892. @@ -58,8 +58,8 @@ nimf_m17n_pa_init (NimfM17nPa *pa)
  1893. nimf_m17n_open_im (m17n);
  1894. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1895. - G_CALLBACK (on_changed_method), m17n);
  1896. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1897. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1898. }
  1899. static void
  1900. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ps.c b/modules/engines/nimf-m17n/nimf-m17n-ps.c
  1901. index a28e677..4589708 100644
  1902. --- a/modules/engines/nimf-m17n/nimf-m17n-ps.c
  1903. +++ b/modules/engines/nimf-m17n/nimf-m17n-ps.c
  1904. @@ -3,7 +3,7 @@
  1905. * nimf-m17n-ps.c
  1906. * This file is part of Nimf.
  1907. *
  1908. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1909. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1910. *
  1911. * Nimf is free software: you can redistribute it and/or modify it
  1912. * under the terms of the GNU Lesser General Public License as published
  1913. @@ -58,8 +58,8 @@ nimf_m17n_ps_init (NimfM17nPs *ps)
  1914. nimf_m17n_open_im (m17n);
  1915. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1916. - G_CALLBACK (on_changed_method), m17n);
  1917. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1918. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1919. }
  1920. static void
  1921. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ru.c b/modules/engines/nimf-m17n/nimf-m17n-ru.c
  1922. index 0b91db1..2d6f6bf 100644
  1923. --- a/modules/engines/nimf-m17n/nimf-m17n-ru.c
  1924. +++ b/modules/engines/nimf-m17n/nimf-m17n-ru.c
  1925. @@ -3,7 +3,7 @@
  1926. * nimf-m17n-ru.c
  1927. * This file is part of Nimf.
  1928. *
  1929. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1930. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1931. *
  1932. * Nimf is free software: you can redistribute it and/or modify it
  1933. * under the terms of the GNU Lesser General Public License as published
  1934. @@ -58,8 +58,8 @@ nimf_m17n_ru_init (NimfM17nRu *ru)
  1935. nimf_m17n_open_im (m17n);
  1936. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1937. - G_CALLBACK (on_changed_method), m17n);
  1938. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1939. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1940. }
  1941. static void
  1942. diff --git a/modules/engines/nimf-m17n/nimf-m17n-sa.c b/modules/engines/nimf-m17n/nimf-m17n-sa.c
  1943. index b3d7946..e91bcba 100644
  1944. --- a/modules/engines/nimf-m17n/nimf-m17n-sa.c
  1945. +++ b/modules/engines/nimf-m17n/nimf-m17n-sa.c
  1946. @@ -3,7 +3,7 @@
  1947. * nimf-m17n-sa.c
  1948. * This file is part of Nimf.
  1949. *
  1950. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1951. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1952. *
  1953. * Nimf is free software: you can redistribute it and/or modify it
  1954. * under the terms of the GNU Lesser General Public License as published
  1955. @@ -58,8 +58,8 @@ nimf_m17n_sa_init (NimfM17nSa *sa)
  1956. nimf_m17n_open_im (m17n);
  1957. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1958. - G_CALLBACK (on_changed_method), m17n);
  1959. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1960. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1961. }
  1962. static void
  1963. diff --git a/modules/engines/nimf-m17n/nimf-m17n-sd.c b/modules/engines/nimf-m17n/nimf-m17n-sd.c
  1964. index 1457e11..fd96cea 100644
  1965. --- a/modules/engines/nimf-m17n/nimf-m17n-sd.c
  1966. +++ b/modules/engines/nimf-m17n/nimf-m17n-sd.c
  1967. @@ -3,7 +3,7 @@
  1968. * nimf-m17n-sd.c
  1969. * This file is part of Nimf.
  1970. *
  1971. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1972. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1973. *
  1974. * Nimf is free software: you can redistribute it and/or modify it
  1975. * under the terms of the GNU Lesser General Public License as published
  1976. @@ -58,8 +58,8 @@ nimf_m17n_sd_init (NimfM17nSd *sd)
  1977. nimf_m17n_open_im (m17n);
  1978. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  1979. - G_CALLBACK (on_changed_method), m17n);
  1980. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  1981. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  1982. }
  1983. static void
  1984. diff --git a/modules/engines/nimf-m17n/nimf-m17n-si.c b/modules/engines/nimf-m17n/nimf-m17n-si.c
  1985. index a5b070f..82a73a9 100644
  1986. --- a/modules/engines/nimf-m17n/nimf-m17n-si.c
  1987. +++ b/modules/engines/nimf-m17n/nimf-m17n-si.c
  1988. @@ -3,7 +3,7 @@
  1989. * nimf-m17n-si.c
  1990. * This file is part of Nimf.
  1991. *
  1992. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  1993. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  1994. *
  1995. * Nimf is free software: you can redistribute it and/or modify it
  1996. * under the terms of the GNU Lesser General Public License as published
  1997. @@ -58,8 +58,8 @@ nimf_m17n_si_init (NimfM17nSi *si)
  1998. nimf_m17n_open_im (m17n);
  1999. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2000. - G_CALLBACK (on_changed_method), m17n);
  2001. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2002. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2003. }
  2004. static void
  2005. diff --git a/modules/engines/nimf-m17n/nimf-m17n-sk.c b/modules/engines/nimf-m17n/nimf-m17n-sk.c
  2006. index 4e39a7d..6b308a4 100644
  2007. --- a/modules/engines/nimf-m17n/nimf-m17n-sk.c
  2008. +++ b/modules/engines/nimf-m17n/nimf-m17n-sk.c
  2009. @@ -3,7 +3,7 @@
  2010. * nimf-m17n-sk.c
  2011. * This file is part of Nimf.
  2012. *
  2013. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2014. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2015. *
  2016. * Nimf is free software: you can redistribute it and/or modify it
  2017. * under the terms of the GNU Lesser General Public License as published
  2018. @@ -58,8 +58,8 @@ nimf_m17n_sk_init (NimfM17nSk *sk)
  2019. nimf_m17n_open_im (m17n);
  2020. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2021. - G_CALLBACK (on_changed_method), m17n);
  2022. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2023. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2024. }
  2025. static void
  2026. diff --git a/modules/engines/nimf-m17n/nimf-m17n-sr.c b/modules/engines/nimf-m17n/nimf-m17n-sr.c
  2027. index dfd9d80..be20d83 100644
  2028. --- a/modules/engines/nimf-m17n/nimf-m17n-sr.c
  2029. +++ b/modules/engines/nimf-m17n/nimf-m17n-sr.c
  2030. @@ -3,7 +3,7 @@
  2031. * nimf-m17n-sr.c
  2032. * This file is part of Nimf.
  2033. *
  2034. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2035. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2036. *
  2037. * Nimf is free software: you can redistribute it and/or modify it
  2038. * under the terms of the GNU Lesser General Public License as published
  2039. @@ -58,8 +58,8 @@ nimf_m17n_sr_init (NimfM17nSr *sr)
  2040. nimf_m17n_open_im (m17n);
  2041. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2042. - G_CALLBACK (on_changed_method), m17n);
  2043. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2044. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2045. }
  2046. static void
  2047. diff --git a/modules/engines/nimf-m17n/nimf-m17n-sv.c b/modules/engines/nimf-m17n/nimf-m17n-sv.c
  2048. index 68dc43e..6541943 100644
  2049. --- a/modules/engines/nimf-m17n/nimf-m17n-sv.c
  2050. +++ b/modules/engines/nimf-m17n/nimf-m17n-sv.c
  2051. @@ -3,7 +3,7 @@
  2052. * nimf-m17n-sv.c
  2053. * This file is part of Nimf.
  2054. *
  2055. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2056. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2057. *
  2058. * Nimf is free software: you can redistribute it and/or modify it
  2059. * under the terms of the GNU Lesser General Public License as published
  2060. @@ -58,8 +58,8 @@ nimf_m17n_sv_init (NimfM17nSv *sv)
  2061. nimf_m17n_open_im (m17n);
  2062. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2063. - G_CALLBACK (on_changed_method), m17n);
  2064. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2065. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2066. }
  2067. static void
  2068. diff --git a/modules/engines/nimf-m17n/nimf-m17n-t.c b/modules/engines/nimf-m17n/nimf-m17n-t.c
  2069. index dc0a10e..79a21dd 100644
  2070. --- a/modules/engines/nimf-m17n/nimf-m17n-t.c
  2071. +++ b/modules/engines/nimf-m17n/nimf-m17n-t.c
  2072. @@ -3,7 +3,7 @@
  2073. * nimf-m17n-t.c
  2074. * This file is part of Nimf.
  2075. *
  2076. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2077. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2078. *
  2079. * Nimf is free software: you can redistribute it and/or modify it
  2080. * under the terms of the GNU Lesser General Public License as published
  2081. @@ -58,8 +58,8 @@ nimf_m17n_t_init (NimfM17nT *t)
  2082. nimf_m17n_open_im (m17n);
  2083. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2084. - G_CALLBACK (on_changed_method), m17n);
  2085. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2086. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2087. }
  2088. static void
  2089. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ta.c b/modules/engines/nimf-m17n/nimf-m17n-ta.c
  2090. index d3ad23b..7c62c99 100644
  2091. --- a/modules/engines/nimf-m17n/nimf-m17n-ta.c
  2092. +++ b/modules/engines/nimf-m17n/nimf-m17n-ta.c
  2093. @@ -3,7 +3,7 @@
  2094. * nimf-m17n-ta.c
  2095. * This file is part of Nimf.
  2096. *
  2097. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2098. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2099. *
  2100. * Nimf is free software: you can redistribute it and/or modify it
  2101. * under the terms of the GNU Lesser General Public License as published
  2102. @@ -58,8 +58,8 @@ nimf_m17n_ta_init (NimfM17nTa *ta)
  2103. nimf_m17n_open_im (m17n);
  2104. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2105. - G_CALLBACK (on_changed_method), m17n);
  2106. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2107. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2108. }
  2109. static void
  2110. diff --git a/modules/engines/nimf-m17n/nimf-m17n-tai.c b/modules/engines/nimf-m17n/nimf-m17n-tai.c
  2111. index 9c0726b..9301892 100644
  2112. --- a/modules/engines/nimf-m17n/nimf-m17n-tai.c
  2113. +++ b/modules/engines/nimf-m17n/nimf-m17n-tai.c
  2114. @@ -3,7 +3,7 @@
  2115. * nimf-m17n-tai.c
  2116. * This file is part of Nimf.
  2117. *
  2118. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2119. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2120. *
  2121. * Nimf is free software: you can redistribute it and/or modify it
  2122. * under the terms of the GNU Lesser General Public License as published
  2123. @@ -58,8 +58,8 @@ nimf_m17n_tai_init (NimfM17nTai *tai)
  2124. nimf_m17n_open_im (m17n);
  2125. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2126. - G_CALLBACK (on_changed_method), m17n);
  2127. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2128. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2129. }
  2130. static void
  2131. diff --git a/modules/engines/nimf-m17n/nimf-m17n-te.c b/modules/engines/nimf-m17n/nimf-m17n-te.c
  2132. index 6501774..4b54e94 100644
  2133. --- a/modules/engines/nimf-m17n/nimf-m17n-te.c
  2134. +++ b/modules/engines/nimf-m17n/nimf-m17n-te.c
  2135. @@ -3,7 +3,7 @@
  2136. * nimf-m17n-te.c
  2137. * This file is part of Nimf.
  2138. *
  2139. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2140. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2141. *
  2142. * Nimf is free software: you can redistribute it and/or modify it
  2143. * under the terms of the GNU Lesser General Public License as published
  2144. @@ -58,8 +58,8 @@ nimf_m17n_te_init (NimfM17nTe *te)
  2145. nimf_m17n_open_im (m17n);
  2146. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2147. - G_CALLBACK (on_changed_method), m17n);
  2148. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2149. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2150. }
  2151. static void
  2152. diff --git a/modules/engines/nimf-m17n/nimf-m17n-th.c b/modules/engines/nimf-m17n/nimf-m17n-th.c
  2153. index 3c8d264..078799d 100644
  2154. --- a/modules/engines/nimf-m17n/nimf-m17n-th.c
  2155. +++ b/modules/engines/nimf-m17n/nimf-m17n-th.c
  2156. @@ -3,7 +3,7 @@
  2157. * nimf-m17n-th.c
  2158. * This file is part of Nimf.
  2159. *
  2160. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2161. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2162. *
  2163. * Nimf is free software: you can redistribute it and/or modify it
  2164. * under the terms of the GNU Lesser General Public License as published
  2165. @@ -58,8 +58,8 @@ nimf_m17n_th_init (NimfM17nTh *th)
  2166. nimf_m17n_open_im (m17n);
  2167. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2168. - G_CALLBACK (on_changed_method), m17n);
  2169. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2170. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2171. }
  2172. static void
  2173. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ug.c b/modules/engines/nimf-m17n/nimf-m17n-ug.c
  2174. index 7ca81f2..ed72d0a 100644
  2175. --- a/modules/engines/nimf-m17n/nimf-m17n-ug.c
  2176. +++ b/modules/engines/nimf-m17n/nimf-m17n-ug.c
  2177. @@ -3,7 +3,7 @@
  2178. * nimf-m17n-ug.c
  2179. * This file is part of Nimf.
  2180. *
  2181. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2182. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2183. *
  2184. * Nimf is free software: you can redistribute it and/or modify it
  2185. * under the terms of the GNU Lesser General Public License as published
  2186. @@ -58,8 +58,8 @@ nimf_m17n_ug_init (NimfM17nUg *ug)
  2187. nimf_m17n_open_im (m17n);
  2188. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2189. - G_CALLBACK (on_changed_method), m17n);
  2190. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2191. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2192. }
  2193. static void
  2194. diff --git a/modules/engines/nimf-m17n/nimf-m17n-uk.c b/modules/engines/nimf-m17n/nimf-m17n-uk.c
  2195. index d3bafc1..77400bc 100644
  2196. --- a/modules/engines/nimf-m17n/nimf-m17n-uk.c
  2197. +++ b/modules/engines/nimf-m17n/nimf-m17n-uk.c
  2198. @@ -3,7 +3,7 @@
  2199. * nimf-m17n-uk.c
  2200. * This file is part of Nimf.
  2201. *
  2202. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2203. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2204. *
  2205. * Nimf is free software: you can redistribute it and/or modify it
  2206. * under the terms of the GNU Lesser General Public License as published
  2207. @@ -58,8 +58,8 @@ nimf_m17n_uk_init (NimfM17nUk *uk)
  2208. nimf_m17n_open_im (m17n);
  2209. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2210. - G_CALLBACK (on_changed_method), m17n);
  2211. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2212. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2213. }
  2214. static void
  2215. diff --git a/modules/engines/nimf-m17n/nimf-m17n-ur.c b/modules/engines/nimf-m17n/nimf-m17n-ur.c
  2216. index 1c6d550..f3e7904 100644
  2217. --- a/modules/engines/nimf-m17n/nimf-m17n-ur.c
  2218. +++ b/modules/engines/nimf-m17n/nimf-m17n-ur.c
  2219. @@ -3,7 +3,7 @@
  2220. * nimf-m17n-ur.c
  2221. * This file is part of Nimf.
  2222. *
  2223. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2224. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2225. *
  2226. * Nimf is free software: you can redistribute it and/or modify it
  2227. * under the terms of the GNU Lesser General Public License as published
  2228. @@ -58,8 +58,8 @@ nimf_m17n_ur_init (NimfM17nUr *ur)
  2229. nimf_m17n_open_im (m17n);
  2230. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2231. - G_CALLBACK (on_changed_method), m17n);
  2232. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2233. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2234. }
  2235. static void
  2236. diff --git a/modules/engines/nimf-m17n/nimf-m17n-uz.c b/modules/engines/nimf-m17n/nimf-m17n-uz.c
  2237. index 9dacfc0..6d4d3a1 100644
  2238. --- a/modules/engines/nimf-m17n/nimf-m17n-uz.c
  2239. +++ b/modules/engines/nimf-m17n/nimf-m17n-uz.c
  2240. @@ -3,7 +3,7 @@
  2241. * nimf-m17n-uz.c
  2242. * This file is part of Nimf.
  2243. *
  2244. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2245. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2246. *
  2247. * Nimf is free software: you can redistribute it and/or modify it
  2248. * under the terms of the GNU Lesser General Public License as published
  2249. @@ -58,8 +58,8 @@ nimf_m17n_uz_init (NimfM17nUz *uz)
  2250. nimf_m17n_open_im (m17n);
  2251. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2252. - G_CALLBACK (on_changed_method), m17n);
  2253. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2254. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2255. }
  2256. static void
  2257. diff --git a/modules/engines/nimf-m17n/nimf-m17n-vi.c b/modules/engines/nimf-m17n/nimf-m17n-vi.c
  2258. index 097ff35..8ac850f 100644
  2259. --- a/modules/engines/nimf-m17n/nimf-m17n-vi.c
  2260. +++ b/modules/engines/nimf-m17n/nimf-m17n-vi.c
  2261. @@ -3,7 +3,7 @@
  2262. * nimf-m17n-vi.c
  2263. * This file is part of Nimf.
  2264. *
  2265. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2266. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2267. *
  2268. * Nimf is free software: you can redistribute it and/or modify it
  2269. * under the terms of the GNU Lesser General Public License as published
  2270. @@ -58,8 +58,8 @@ nimf_m17n_vi_init (NimfM17nVi *vi)
  2271. nimf_m17n_open_im (m17n);
  2272. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2273. - G_CALLBACK (on_changed_method), m17n);
  2274. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2275. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2276. }
  2277. static void
  2278. diff --git a/modules/engines/nimf-m17n/nimf-m17n-yi.c b/modules/engines/nimf-m17n/nimf-m17n-yi.c
  2279. index 86a0f94..b852270 100644
  2280. --- a/modules/engines/nimf-m17n/nimf-m17n-yi.c
  2281. +++ b/modules/engines/nimf-m17n/nimf-m17n-yi.c
  2282. @@ -3,7 +3,7 @@
  2283. * nimf-m17n-yi.c
  2284. * This file is part of Nimf.
  2285. *
  2286. - * Copyright (C) 2019 Hodong Kim <cogniti@gmail.com>
  2287. + * Copyright (C) 2019,2020 Hodong Kim <cogniti@gmail.com>
  2288. *
  2289. * Nimf is free software: you can redistribute it and/or modify it
  2290. * under the terms of the GNU Lesser General Public License as published
  2291. @@ -58,8 +58,8 @@ nimf_m17n_yi_init (NimfM17nYi *yi)
  2292. nimf_m17n_open_im (m17n);
  2293. - g_signal_connect (m17n->settings, "changed::get-method-infos",
  2294. - G_CALLBACK (on_changed_method), m17n);
  2295. + g_signal_connect_data (m17n->settings, "changed::get-method-infos",
  2296. + G_CALLBACK (on_changed_method), m17n, NULL, G_CONNECT_AFTER);
  2297. }
  2298. static void
  2299. diff --git a/modules/engines/nimf-rime/nimf-rime.c b/modules/engines/nimf-rime/nimf-rime.c
  2300. index 52c952e..1e2e255 100644
  2301. --- a/modules/engines/nimf-rime/nimf-rime.c
  2302. +++ b/modules/engines/nimf-rime/nimf-rime.c
  2303. @@ -3,7 +3,7 @@
  2304. * nimf-rime.c
  2305. * This file is part of Nimf.
  2306. *
  2307. - * Copyright (C) 2016-2019 Hodong Kim <cogniti@gmail.com>
  2308. + * Copyright (C) 2016-2020 Hodong Kim <cogniti@gmail.com>
  2309. *
  2310. * Nimf is free software: you can redistribute it and/or modify it
  2311. * under the terms of the GNU Lesser General Public License as published
  2312. @@ -432,8 +432,8 @@ nimf_rime_init (NimfRime *rime)
  2313. rime->session_id = RimeCreateSession();
  2314. RimeSetOption (rime->session_id, "simplification", rime->is_simplified);
  2315. - g_signal_connect (rime->settings, "changed::simplification",
  2316. - G_CALLBACK (on_changed_simplification), rime);
  2317. + g_signal_connect_data (rime->settings, "changed::simplification",
  2318. + G_CALLBACK (on_changed_simplification), rime, NULL, G_CONNECT_AFTER);
  2319. }
  2320. static void
  2321. diff --git a/modules/services/indicator/nimf-indicator.c b/modules/services/indicator/nimf-indicator.c
  2322. index eb4bffc..64c8296 100644
  2323. --- a/modules/services/indicator/nimf-indicator.c
  2324. +++ b/modules/services/indicator/nimf-indicator.c
  2325. @@ -3,7 +3,7 @@
  2326. * nimf-indicator.c
  2327. * This file is part of Nimf.
  2328. *
  2329. - * Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  2330. + * Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  2331. *
  2332. * Nimf is free software: you can redistribute it and/or modify it
  2333. * under the terms of the GNU Lesser General Public License as published
  2334. @@ -119,7 +119,7 @@ on_menu_about (GSimpleAction *action,
  2335. "artists", artists,
  2336. "authors", authors,
  2337. "comments", _("Nimf is an input method framework"),
  2338. - "copyright", _("Copyright (c) 2015-2019 Hodong Kim"),
  2339. + "copyright", _("Copyright (c) 2015-2020 Hodong Kim"),
  2340. "documenters", documenters,
  2341. "license-type", GTK_LICENSE_LGPL_3_0,
  2342. "logo-icon-name", "nimf-logo",
  2343. diff --git a/nimf.spec b/nimf.spec
  2344. index b94eeb1..eeacb9c 100644
  2345. --- a/nimf.spec
  2346. +++ b/nimf.spec
  2347. @@ -1,6 +1,6 @@
  2348. Name: nimf
  2349. Summary: An input method framework
  2350. -Version: 2019.08.14
  2351. +Version: 2020.04.28
  2352. Release: 1%{?dist}
  2353. License: LGPLv3+
  2354. Group: User Interface/Desktops
  2355. @@ -15,14 +15,12 @@ BuildRequires: intltool >= 0.50.1
  2356. BuildRequires: gtk3-devel
  2357. BuildRequires: gtk2-devel
  2358. %if 0%{?is_opensuse}
  2359. -BuildRequires: libqt4-devel
  2360. BuildRequires: libqt5-qtbase-devel
  2361. BuildRequires: libQt5Gui-private-headers-devel
  2362. BuildRequires: libappindicator3-devel
  2363. BuildRequires: rsvg-view
  2364. BuildRequires: noto-sans-cjk-fonts
  2365. %else
  2366. -BuildRequires: qt4-devel
  2367. BuildRequires: qt5-qtbase-devel
  2368. BuildRequires: qt5-qtbase-private-devel
  2369. BuildRequires: libappindicator-gtk3-devel
  2370. @@ -132,7 +130,6 @@ fi
  2371. %{_libdir}/gtk-3.0/*
  2372. %{_libdir}/libnimf.so.*
  2373. %{_libdir}/nimf/*
  2374. -%{_libdir}/qt4/*
  2375. %{_libdir}/qt5/*
  2376. %{_datadir}/applications/*
  2377. %{_datadir}/glib-2.0/*
  2378. @@ -149,5 +146,5 @@ fi
  2379. %{_libdir}/pkgconfig/*
  2380. %changelog
  2381. -* Wed Aug 14 2019 Hodong Kim <cogniti@gmail.com> - 2019.08.14-1
  2382. -- See https://gitlab.com/nimf-i18n/nimf/blob/master/debian/changelog
  2383. +* Tue Apr 28 2020 Hodong Kim <cogniti@gmail.com> - 2020.04.28-1
  2384. +- See https://www.nimfsoft.com
  2385. diff --git a/po/POTFILES.in b/po/POTFILES.in
  2386. index 0381816..a952ca9 100644
  2387. --- a/po/POTFILES.in
  2388. +++ b/po/POTFILES.in
  2389. @@ -13,7 +13,6 @@ modules/services/indicator/nimf-indicator.c
  2390. [type: gettext/gsettings]bin/nimf-settings/org.nimf.settings.gschema.xml
  2391. [type: gettext/gsettings]libnimf/org.nimf.gschema.xml
  2392. [type: gettext/gsettings]modules/clients/gtk/org.nimf.clients.gtk.gschema.xml
  2393. -[type: gettext/gsettings]modules/clients/qt4/org.nimf.clients.qt4.gschema.xml
  2394. [type: gettext/gsettings]modules/clients/qt5/org.nimf.clients.qt5.gschema.xml
  2395. [type: gettext/gsettings]modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml
  2396. [type: gettext/gsettings]modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml
  2397. diff --git a/po/de.po b/po/de.po
  2398. index 93219c3..53f1e9b 100644
  2399. --- a/po/de.po
  2400. +++ b/po/de.po
  2401. @@ -1,7 +1,7 @@
  2402. # German translation for Nimf
  2403. -# Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  2404. +# Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  2405. # This file is distributed under the same license as the Nimf project.
  2406. -# Hodong Kim <cogniti@gmail.com>, 2015-2019.
  2407. +# Hodong Kim <cogniti@gmail.com>, 2015-2020.
  2408. # Max Neupert <abonnements@revolwear.com>, 2017.
  2409. #
  2410. #, fuzzy
  2411. @@ -10,7 +10,7 @@ msgstr ""
  2412. "Project-Id-Version: nimf\n"
  2413. "Report-Msgid-Bugs-To: \n"
  2414. "POT-Creation-Date: 2019-07-03 17:54+0900\n"
  2415. -"PO-Revision-Date: 2019-07-03 17:55+0900\n"
  2416. +"PO-Revision-Date: 2020-04-28 22:12+0900\n"
  2417. "Last-Translator: Max Neupert <abonnements@revolwear.com>\n"
  2418. "Language-Team: German\n"
  2419. "Language: de\n"
  2420. @@ -168,7 +168,6 @@ msgstr ""
  2421. #: ../libnimf/org.nimf.gschema.xml.h:2
  2422. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:2
  2423. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:2
  2424. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:2
  2425. #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:2
  2426. #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:2
  2427. @@ -186,7 +185,6 @@ msgstr "nimf-settings Schema name"
  2428. #: ../libnimf/org.nimf.gschema.xml.h:3
  2429. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:3
  2430. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:3
  2431. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:3
  2432. #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:3
  2433. #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:3
  2434. @@ -275,15 +273,10 @@ msgstr ""
  2435. "verhindert Fehler in vielen Anwendungen"
  2436. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:6
  2437. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:4
  2438. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:4
  2439. msgid "Reset when clicking the mouse button"
  2440. msgstr "Zurücksetzen bei Mausklick"
  2441. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:1
  2442. -msgid "'Qt4'"
  2443. -msgstr ""
  2444. -
  2445. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:1
  2446. msgid "'Qt5'"
  2447. msgstr ""
  2448. diff --git a/po/ko.po b/po/ko.po
  2449. index abdc976..231912a 100644
  2450. --- a/po/ko.po
  2451. +++ b/po/ko.po
  2452. @@ -1,7 +1,7 @@
  2453. # Korean translation for Nimf
  2454. -# Copyright (C) 2015-2019 Hodong Kim <cogniti@gmail.com>
  2455. +# Copyright (C) 2015-2020 Hodong Kim <cogniti@gmail.com>
  2456. # This file is distributed under the same license as the Nimf project.
  2457. -# Hodong Kim <cogniti@gmail.com>, 2015-2019.
  2458. +# Hodong Kim <cogniti@gmail.com>, 2015-2020.
  2459. #
  2460. #, fuzzy
  2461. msgid ""
  2462. @@ -9,7 +9,7 @@ msgstr ""
  2463. "Project-Id-Version: nimf\n"
  2464. "Report-Msgid-Bugs-To: \n"
  2465. "POT-Creation-Date: 2019-07-03 17:54+0900\n"
  2466. -"PO-Revision-Date: 2019-07-03 19:04+0900\n"
  2467. +"PO-Revision-Date: 2020-04-28 22:12+0900\n"
  2468. "Last-Translator: Hodong Kim <cogniti@gmail.com>\n"
  2469. "Language-Team: Hodong Kim <cogniti@gmail.com>\n"
  2470. "Language: ko\n"
  2471. @@ -167,7 +167,6 @@ msgstr "'님프'"
  2472. #: ../libnimf/org.nimf.gschema.xml.h:2
  2473. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:2
  2474. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:2
  2475. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:2
  2476. #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:2
  2477. #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:2
  2478. @@ -185,7 +184,6 @@ msgstr "nimf-settings 를 위한 스키마 이름"
  2479. #: ../libnimf/org.nimf.gschema.xml.h:3
  2480. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:3
  2481. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:3
  2482. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:3
  2483. #: ../modules/engines/nimf-anthy/org.nimf.engines.nimf-anthy.gschema.xml.h:3
  2484. #: ../modules/engines/nimf-libhangul/org.nimf.engines.nimf-libhangul.gschema.xml.h:3
  2485. @@ -280,15 +278,10 @@ msgstr "모든 키 이벤트를 전달하기 전에 그것들을 투과시킵니
  2486. " 이것은 여러 응용 프로그램의 버그를 회피합니다."
  2487. #: ../modules/clients/gtk/org.nimf.clients.gtk.gschema.xml.h:6
  2488. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:4
  2489. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:4
  2490. msgid "Reset when clicking the mouse button"
  2491. msgstr "마우스 버튼을 클릭할 때 리셋합니다"
  2492. -#: ../modules/clients/qt4/org.nimf.clients.qt4.gschema.xml.h:1
  2493. -msgid "'Qt4'"
  2494. -msgstr ""
  2495. -
  2496. #: ../modules/clients/qt5/org.nimf.clients.qt5.gschema.xml.h:1
  2497. msgid "'Qt5'"
  2498. msgstr ""