rpms/im-sdk/FC-3 iiimgcf-deadkey.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: tagoh

Update of /cvs/dist/rpms/im-sdk/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv12478

Modified Files:
	iiimgcf-deadkey.patch 
Log Message:
updated.

iiimgcf-deadkey.patch:
 gtkimcontextiiim.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 gtkimcontextiiim.h |    1 
 2 files changed, 56 insertions(+), 1 deletion(-)

Index: iiimgcf-deadkey.patch
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/iiimgcf-deadkey.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iiimgcf-deadkey.patch	28 Jul 2005 06:02:15 -0000	1.1
+++ iiimgcf-deadkey.patch	28 Jul 2005 12:11:14 -0000	1.2
@@ -1,15 +1,15 @@
-diff -ruN -x .libs -x .deps -x '*~' -x '*o' -x '*a' -x Makefile iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.c iiimf-12.2/iiimgcf/gtkimcontextiiim.c
---- iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.c	2005-07-21 12:12:31.000000000 +0900
-+++ iiimf-12.2/iiimgcf/gtkimcontextiiim.c	2005-07-22 17:05:03.000000000 +0900
-@@ -29,6 +29,7 @@
+diff -ruN im-sdk-r12_1-svn2002.orig/iiimgcf/gtkimcontextiiim.c im-sdk-r12_1-svn2002/iiimgcf/gtkimcontextiiim.c
+--- im-sdk-r12_1-svn2002.orig/iiimgcf/gtkimcontextiiim.c	2005-07-28 20:50:35.000000000 +0900
++++ im-sdk-r12_1-svn2002/iiimgcf/gtkimcontextiiim.c	2005-07-28 20:53:03.000000000 +0900
+@@ -28,6 +28,7 @@
+ #include <gdk/gdkx.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkimmodule.h>
- #include <gtk/gtkinvisible.h>
 +#include <gtk/gtkimcontextsimple.h>
- #include <gdk/gdkproperty.h>
- #include <gdk/gdkselection.h>
  #include <stdlib.h>
-@@ -46,6 +47,28 @@
+ #include <string.h>
+ #include "iiimcf.h"
+@@ -42,6 +43,28 @@
  #define DEBUG_DO(x)
  #endif
  
@@ -38,7 +38,7 @@
  typedef struct _CandidateWindow CandidateWindow;
  
  /* Style for gtk input method preedit/status */
-@@ -1530,6 +1553,16 @@
+@@ -1521,6 +1544,16 @@
  }
  
  static void
@@ -55,7 +55,7 @@
  im_context_iiim_init (GtkIMContextIIIM * im_context_iiim)
  {
    im_context_iiim->context = NULL;
-@@ -1541,6 +1574,11 @@
+@@ -1532,6 +1565,11 @@
    im_context_iiim->has_focus = FALSE;
    im_context_iiim->in_toplevel = FALSE;
  
@@ -64,10 +64,10 @@
 +  g_signal_connect(G_OBJECT(im_context_iiim->slave), "commit",
 +		   G_CALLBACK(im_context_iiim_commit_cb), im_context_iiim);
 +
-   memset(&im_context_iiim->saved_key, 0, sizeof(im_context_iiim->saved_key));
- 
    bindtextdomain (GETTEXT_PACKAGE, IIIMGCFLOCALEDIR);
-@@ -1690,10 +1728,11 @@
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ }
+@@ -1664,10 +1702,11 @@
    IIIMCF_keyevent kev;
    IIIMCF_event ev;
    gint store_key = 0;
@@ -80,7 +80,7 @@
  
    if (current_setting_enabled &&
        current_setting.im_enabled == IM_OFF)
-@@ -1745,6 +1784,15 @@
+@@ -1719,6 +1758,15 @@
      return FALSE;
  
   commit_this_event:
@@ -96,7 +96,7 @@
    if (event->state &
        (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK))
      return FALSE;
-@@ -1828,8 +1876,14 @@
+@@ -1800,8 +1848,14 @@
    g_free (context_iiim->current_language);
  
    iiim_keylist_free (context_iiim);
@@ -111,9 +111,9 @@
  }
  
  static void
-diff -ruN -x .libs -x .deps -x '*~' -x '*o' -x '*a' -x Makefile iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.h iiimf-12.2/iiimgcf/gtkimcontextiiim.h
---- iiimf-12.2.orig/iiimgcf/gtkimcontextiiim.h	2005-07-21 12:12:31.000000000 +0900
-+++ iiimf-12.2/iiimgcf/gtkimcontextiiim.h	2005-07-22 16:45:40.000000000 +0900
+diff -ruN im-sdk-r12_1-svn2002.orig/iiimgcf/gtkimcontextiiim.h im-sdk-r12_1-svn2002/iiimgcf/gtkimcontextiiim.h
+--- im-sdk-r12_1-svn2002.orig/iiimgcf/gtkimcontextiiim.h	2005-07-28 20:50:35.000000000 +0900
++++ im-sdk-r12_1-svn2002/iiimgcf/gtkimcontextiiim.h	2005-07-28 20:50:55.000000000 +0900
 @@ -66,6 +66,7 @@
  struct _GtkIMContextIIIM
  {