rpms/iiimf/devel leif-unit-U+000A-r2484-132936.patch, NONE, 1.1 iiimf.spec, 1.22, 1.23

Fri Apr 15 07:56:41 UTC 2005

Update of /cvs/dist/rpms/iiimf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28983

Modified Files:
	iiimf.spec 
Added Files:
	leif-unit-U+000A-r2484-132936.patch 
Log Message:
* Fri Apr 15 2005 Akira TAGOH <tagoh at redhat.com>
- leif-unit-U+000A-r2484-132936.patch: applied to fix not committing an enter
  with U+000A on UNICODE-HEX. (#132936)
- Use %%find_lang macro instead of listing %%{_datadir}/locale directly.
- Fixed the unwanted own directories. (#154602)
  - %%{_libexecdir}
  - %%{_sysconfdir}/gconf/schemas
  - %%{_datadir}/emacs/site-lisp
  - %%{_datadir}/pixmaps
- Added Requires: emacs-common for iiimf-emacs.


leif-unit-U+000A-r2484-132936.patch:
 ChangeLog                       |    7 +++++++
 codepoint_im/codepoint_filter.c |   12 +++++++++++-
 leif/key_event.c                |    8 +++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

--- NEW FILE leif-unit-U+000A-r2484-132936.patch ---
Index: leif/unit/leif/key_event.c
===================================================================
--- leif/unit/leif/key_event.c	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2483)
+++ leif/unit/leif/key_event.c	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2484)
@@ -518,8 +518,14 @@
 
     if (ret == IME_NOT_USED_KEY)
 	iml_sendback_key(s, key_event);
-    else 
+    else if (ret == RETURN_KEY) {
+	key_event->keyCode = IM_VK_ENTER;
+	key_event->keyChar = 0;
+	key_event->modifier = 0;
 	le_output_ime_buffer(s, session_data->ime_buffer);
+	iml_sendback_key(s, key_event);
+    } else
+	le_output_ime_buffer(s, session_data->ime_buffer);
 
     if ((session_data->ime_buffer->deadkey_flag == IME_HOTKEY_END) && !session_data->ime_buffer->conv_flag) {
 	proc_key_switch_conversion_event(udp, s, CONVERSION_OFF, (char *)NULL);
Index: leif/unit/ChangeLog
===================================================================
--- leif/unit/ChangeLog	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2483)
+++ leif/unit/ChangeLog	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2484)
@@ -1,3 +1,10 @@
+2005-04-14  Sriram Swaminathan  <sriram.swaminathan at sun.com>
+
+	* leif/key_event.c
+	* codepoint_im/codepoint_filter.c
+
+	Fix to commit RETURN key when 0x000a is the input in UNICODE-HEX mode.
+
 2005-04-13  Jens Petersen  <petersen at redhat.com>
 
 	* ctim/Makefile.am (moduledir): Use IM_LEIFDIR instead of IM_LOCALEDIR.
Index: leif/unit/codepoint_im/codepoint_filter.c
===================================================================
--- leif/unit/codepoint_im/codepoint_filter.c	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2483)
+++ leif/unit/codepoint_im/codepoint_filter.c	(ãƒªãƒ“ã‚¸ãƒ§ãƒ³ 2484)
@@ -126,6 +126,9 @@
     sprintf(tmpstr,"0%s",Preedit_Buf);
   }
   from_buf[0] = (wchar_t)strtol(tmpstr,&ret, 0);
+  if (from_buf[0] == IM_VK_ENTER) {
+    return RETURN_KEY;
+  }
   from_buf[1] = L'\0'; 
   convert_UCS4_to_UTF8(from_buf, to_buf);
   (void)strcpy((char *)Commit_Buf, (char *)to_buf);
@@ -182,7 +185,14 @@
       Preedit_Buf[Preedit_Len] = key;
       Preedit_Len += 1;
       Preedit_Buf[Preedit_Len] = '\0';
-      commit_candidate(ime_buffer, unit_table);
+      if (commit_candidate(ime_buffer, unit_table) == RETURN_KEY) {
+        Preedit_Len = 0;
+        Preedit_CaretPos = 0;
+        Input_Len = 0;
+        Input_Buf[Input_Len]='\0';
+        IME_Status |= IME_PREEDIT_AREA; 
+        return RETURN_KEY;
+      }
       Preedit_Len = 0;
       Preedit_CaretPos = 0;
       Input_Len = 0;


Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- iiimf.spec	14 Apr 2005 11:37:46 -0000	1.22
+++ iiimf.spec	15 Apr 2005 07:56:39 -0000	1.23
@@ -124,6 +124,7 @@
 ### RH-specific (+50~)
 
 ## LEIF(UNIT) patches (2800-)
+Patch2800: leif-unit-U+000A-r2484-132936.patch
 ### RH-specific (+50~)
 Patch2850: leif-unit-rh-fix-build-20040203.patch
 
@@ -150,6 +151,7 @@
 %package emacs
 Summary: Internet/Intranet Input Method Emacs Client Framework
 Group: Applications/Editors
+Requires: emacs-common
 
 %description emacs
 IIIMECF provides an Emacs library to make IIIM aware applications and
@@ -424,6 +426,7 @@
 ## LEIF(Sun Traditional Chinese) patches (2700-)
 ### RH-specific (+50~)
 ## LEIF(UNIT) patches (2800-)
+%patch2800 -p0 -b .2800-U+000A
 ### RH-specific (+50~)
 %patch2850 -p1 -b .2850-rh-build-20040203
 ## LEIF(others) patches (4000-)
@@ -480,6 +483,9 @@
 make DESTDIR=$RPM_BUILD_ROOT install BUILDDIRS="%{builddirs}" LE_TARGETS="%{le_base}"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+%find_lang iiimf-im-switcher
+%find_lang iiimgcf
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
 cp iiimsf/sys/RedHat/iiimd $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{iiim_service}
 
@@ -771,23 +777,22 @@
 %files emacs
 %defattr(-, root, root,-)
 %doc iiimecf/{COPYING,lisp/ChangeLog,README*}
-%{_datadir}/emacs/site-lisp
+%{_datadir}/emacs/site-lisp/iiimf
+%{_datadir}/emacs/site-lisp/site-start.d/iiimf-init.el
 %{_bindir}/udclient
 %endif
 
-%files gtk
+%files -f iiimgcf.lang gtk
 %defattr (-, root, root,-)
 %{_libdir}/gtk-2.0/*/immodules/im-iiim.so
 %{_sysconfdir}/X11/xinit/xinput.d
 
-%files gnome-im-switcher
+%files -f iiimf-im-switcher.lang gnome-im-switcher
 %defattr (-, root, root,-)
 %doc gnome-im-switcher/{AUTHORS,COPYING,ChangeLog,README}
-%{_sysconfdir}/gconf/schemas
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_libdir}/bonobo
-%dir %{_libexecdir}
 %{_libexecdir}/gnome-im-switcher-applet
-%{_datadir}/locale
 %{_datadir}/gnome-2.0
 %{_datadir}/%{gimlet}
 %{_datadir}/gnome/help/imswitcher
@@ -795,7 +800,8 @@
 %{_bindir}/gnome-im*
 %{_datadir}/control-center-2.0
 %{_datadir}/icons/hicolor
-%{_datadir}/pixmaps
+%{_datadir}/pixmaps/gimlet*.png
+%{_datadir}/pixmaps/gnome*.png
 
 %files libs
 %defattr (-, root, root,-)
@@ -828,7 +834,6 @@
 %dir %{_localstatedir}/log/iiim
 %defattr (-, root, root,-)
 %dir %{_sysconfdir}/iiim
-%dir %{_libexecdir}
 %{_sysconfdir}/rc.d/init.d/*
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/htt.conf
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/htt.conf.old
@@ -933,10 +938,21 @@
 %endif
 
 %changelog
+* Fri Apr 15 2005 Akira TAGOH <tagoh at redhat.com>
+- leif-unit-U+000A-r2484-132936.patch: applied to fix not committing an enter
+  with U+000A on UNICODE-HEX. (#132936)
+
 * Thu Apr 14 2005 Akira TAGOH <tagoh at redhat.com>
 - iiimgcf-fix-status-position-with-focusin-r2483-139809.patch:
   Fixed not updating the status window position when the window focus was
   changed with alt+tab. (#139809)
+- Use %%find_lang macro instead of listing %%{_datadir}/locale directly.
+- Fixed the unwanted own directories. (#154602)
+  - %%{_libexecdir}
+  - %%{_sysconfdir}/gconf/schemas
+  - %%{_datadir}/emacs/site-lisp
+  - %%{_datadir}/pixmaps
+- Added Requires: emacs-common for iiimf-emacs.
 
 * Thu Apr 14 2005 Jens Petersen <petersen at redhat.com> - 1:12.1.1-14.svn2476
 - update to latest snapshot with bootstrapping fixes


