rpms/iiimf-le-chinput/devel iiimf-le-chinput-switch_off_luc-ia64_prototype.patch, NONE, 1.1 iiimf-le-chinput-preedit.patch, 1.5, 1.6 iiimf-le-chinput.spec, 1.12, 1.13

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 18 07:41:37 UTC 2005


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

Modified Files:
	iiimf-le-chinput-preedit.patch iiimf-le-chinput.spec 
Added Files:
	iiimf-le-chinput-switch_off_luc-ia64_prototype.patch 
Log Message:
merge fixes from FC3/RHEL4


iiimf-le-chinput-switch_off_luc-ia64_prototype.patch:
 chinput.c     |    5 ++++-
 xaux/status.c |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE iiimf-le-chinput-switch_off_luc-ia64_prototype.patch ---
diff -uNr iiimf-le-chinput-0.3.orig/src/chinput.c iiimf-le-chinput-0.3/src/chinput.c
--- iiimf-le-chinput-0.3.orig/src/chinput.c	2004-12-01 18:14:28.216260848 +0800
+++ iiimf-le-chinput-0.3/src/chinput.c	2004-12-01 18:15:35.924967560 +0800
@@ -920,6 +920,7 @@
 )
 {
     MyDataPerSession *session_data = (MyDataPerSession *) s->specific_data;
+    iml_inst *lp;
     #ifdef	DEBUG
     printf("if_chinput_UnsetSCFocus()\n");
     debugprint(s);
@@ -931,7 +932,9 @@
     memset(session_data->conversion_string, 0, sizeof(UTFCHAR) * BUFSIZE);
     session_data->caret_pos = -1;
     preedit_draw(s);
-    //lookup_draw(s, NULL, 0);
+    lp = (iml_inst*)s->If->m->iml_make_lookup_done_inst(s);
+    s->If->m->iml_execute(s, &lp);
+    session_data->luc_start = False;
     IMM_ResetInput(chinput_imm);
     int pIntegerList[1];
     char *pStrings[1];
diff -uNr iiimf-le-chinput-0.3.orig/src/xaux/status.c iiimf-le-chinput-0.3/src/xaux/status.c
--- iiimf-le-chinput-0.3.orig/src/xaux/status.c	2004-12-01 18:14:28.215261000 +0800
+++ iiimf-le-chinput-0.3/src/xaux/status.c	2004-12-01 18:17:15.033900712 +0800
@@ -98,6 +98,7 @@
 /* Create a new hbox with an image and a label packed into it
  * and return the box. */
 
+GtkWidget*
 create_icon_from_xpm (const char **xpm,
                       int          width,
                       int          height,

iiimf-le-chinput-preedit.patch:
 chinput.c  |   19 +++++++++++++++----
 inpinyin.h |    1 +
 wrapper.c  |    4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

Index: iiimf-le-chinput-preedit.patch
===================================================================
RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput-preedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iiimf-le-chinput-preedit.patch	30 Oct 2004 09:12:34 -0000	1.5
+++ iiimf-le-chinput-preedit.patch	18 Mar 2005 07:41:33 -0000	1.6
@@ -42,15 +42,7 @@
      int i;
      int r;
  
-@@ -821,6 +821,7 @@
-                 #ifdef	DEBUG
-                 printf("if_chinput_SetSCValue(), set my conversion on.\n");
-                 #endif
-+                IMM_ResetInput(chinput_imm);
-                 my_conversion_on(s);
-                 break;
-                 
-@@ -920,10 +921,20 @@
+@@ -920,10 +920,20 @@
      iml_session_t * s
  )
  {
@@ -71,7 +63,7 @@
  }
  
  void
-@@ -1099,11 +1110,12 @@
+@@ -1099,11 +1109,12 @@
          printf("imdata->labeltype=%d\n",imdata->labeltype);
      }
  


Index: iiimf-le-chinput.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- iiimf-le-chinput.spec	18 Mar 2005 07:37:39 -0000	1.12
+++ iiimf-le-chinput.spec	18 Mar 2005 07:41:34 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: A Simplified Chinese language engine for im-sdk
 Name: iiimf-le-chinput
 Version: 0.3
-Release: 15
+Release: 17
 License: Distributable
 Source: %{name}-%{version}.tar.bz2
 URL: http://people.redhat.com/yshao/im-sdk/
@@ -18,6 +18,8 @@
 Patch1: iiimf-le-chinput-preedit.patch
 Patch2: iiimf-le-chinput-auxoff.patch
 Patch3: iiimf-le-chinput-build.patch
+Patch4: iiimf-le-chinput-wait-ext.patch
+Patch5: iiimf-le-chinput-switch_off_luc-ia64_prototype.patch
 
 Requires(post): %{_bindir}/iiimf-le-tools, %{_bindir}/killall
 Requires(preun): %{_bindir}/iiimf-le-tools
@@ -39,6 +41,8 @@
 %patch1 -p1 -b .preedit
 %patch2 -p1 -b .auxoff
 %patch3 -p1 -b .build
+%patch4 -p1 -b .wait-ext
+%patch5 -p1 -b .switch_off_luc-ia64_prototype
 
 %build
 aclocal -I m4
@@ -73,9 +77,16 @@
 %{im_dir}/*
 
 %changelog
-* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.3-15
+* Thu Mar 17 2005 Warren Togami <wtogami at redhat.com> 0.3-17
 - rebuild with gcc4
 
+* Wed Dec 1 2004 Yu Shao <yshao at redhat.com> 0.3-16
+- fix bug 141090, Clear lookup window after switching IC
+- fix bug 140692, Aux is not up on IA64
+
+* Wed Nov 24 2004 Yu Shao <yshao at redhat.com> 0.3-15
+- fix bug 136135, LE aux window not displayed after switching LE to it
+
 * Thu Nov 18 2004 Yu Shao <yshao at redhat.com> 0.3-14
 - rebuild
 




More information about the fedora-cvs-commits mailing list