diff attached.
diff -u im-sdk-12.3.91/debian/changelog im-sdk-12.3.91/debian/changelog
--- im-sdk-12.3.91/debian/changelog
+++ im-sdk-12.3.91/debian/changelog
@@ -1,3 +1,10 @@
+im-sdk (12.3.91-6.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix several implicit pointer conversions (Closes: #355612)
+
+ -- dann frazier <da...@debian.org> Mon, 19 Jan 2009 16:21:05 -0700
+
im-sdk (12.3.91-6.2) unstable; urgency=medium
* Non-maintainer upload.
only in patch2:
unchanged:
--- im-sdk-12.3.91.orig/debian/patches/060_implicit-pointer-conversions.patch
+++ im-sdk-12.3.91/debian/patches/060_implicit-pointer-conversions.patch
@@ -0,0 +1,421 @@
+diff -urpN iiimf-12.3.91-svn2814.orig/iiimxcf/xiiimp.so/iiimp/iiimpSwitcher.h
iiimf-12.3.91-svn2814/iiimxcf/xiiimp.so/iiimp/iiimpSwitcher.h
+--- iiimf-12.3.91-svn2814.orig/iiimxcf/xiiimp.so/iiimp/iiimpSwitcher.h
2005-08-11 22:38:14.000000000 -0600
++++ iiimf-12.3.91-svn2814/iiimxcf/xiiimp.so/iiimp/iiimpSwitcher.h
2009-01-12 10:26:57.000000000 -0700
+@@ -45,6 +45,9 @@ Sun Microsystems, Inc. or its licensors
+
+ #include "iiimpIM.h"
+
++char **my_strsplit (const char *string,
++ const char *single_delimiter);
++
+ Bool im_switcher_active (XimCommon im);
+ Bool im_switcher_new (XimCommon im);
+ void im_switcher_shutdown (XimCommon im);
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/newpy/xaux/gifalloc.c
iiimf-12.3.91-svn2814/leif/newpy/xaux/gifalloc.c
+--- iiimf-12.3.91-svn2814.orig/leif/newpy/xaux/gifalloc.c 2002-10-31
17:15:38.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/newpy/xaux/gifalloc.c 2009-01-12
10:27:01.000000000 -0700
+@@ -10,6 +10,7 @@
+ * 15 Sep 92 - Version 1.0 by Eric Raymond. *
+ *****************************************************************************/
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "gif_lib.h"
+
+ #define MAX(x, y) (((x) > (y)) ? (x) : (y))
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/include/imbean.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/include/imbean.h
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/include/imbean.h
2005-04-28 06:33:45.000000000 -0600
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/include/imbean.h 2009-01-12
10:27:01.000000000 -0700
+@@ -67,4 +67,7 @@ typedef struct _IbmlData {
+ IbmlCategoryPtr *categories;
+ } IbmlData;
+
++IbmlData *imbean_config_new_from_file(char *file_name);
++IbmlData *imbean_config_new_from_memory(char *buffer, int size);
++
+ #endif /* _IBML_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
2005-06-27 21:16:37.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
2009-01-12 10:27:02.000000000 -0700
+@@ -2,6 +2,7 @@
+ #include "palette_pixmap.h"
+ #include "palette_messages.h"
+ #include "palette_aux.h"
++#include "palette_menu.h"
+
+ enum {
+ BUTTON_STATE_NORMAL = 0,
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
2005-06-27 21:16:37.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
2009-01-12 10:27:02.000000000 -0700
+@@ -134,4 +134,9 @@ typedef struct _palette_session_t {
+ char *ime_uuid;
+ } palette_session_t;
+
++palette_window_t *palette_window_new();
++palette_button_t *palette_window_get_button_from_pos(palette_window_t
*palette_window, int x, int y);
++vkb_layout_t *palette_window_get_current_ime_vkb_layout(palette_window_t
*palette_window);
++vkb_layout_t **palette_window_get_vkb_layout_list(palette_window_t
*palette_window);
++
+ #endif /* _PALETTE_AUX_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
1969-12-31 17:00:00.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
2009-01-12 10:27:02.000000000 -0700
+@@ -0,0 +1,18 @@
++#ifndef _PALETTE_MENU_H_
++#define _PALETTE_MENU_H_
++
++#include <stdio.h>
++#include <gdk/gdkx.h>
++#include <gtk/gtk.h>
++#include <signal.h>
++#include <wait.h>
++
++#include "palette_messages.h"
++#include "palette_aux.h"
++#include "vkb_aux.h"
++
++GtkWidget *palette_window_create_utility_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_update_utility_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_create_vkb_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_update_vkb_list_menu(palette_window_t
*palette_window);
++#endif
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_data.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_data.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_data.h
2005-06-27 21:16:37.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_data.h
2009-01-12 10:27:02.000000000 -0700
+@@ -62,4 +62,6 @@ enum {
+ PROPERTY_DATA_FOR_ALL
+ };
+
++property_data_t *property_data_new();
++
+ #endif /* _PROPERTY_DATA_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_window.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_window.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_window.h
2005-02-28 03:10:03.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/property_window.h
2009-01-12 10:27:02.000000000 -0700
+@@ -50,4 +50,6 @@ typedef struct _property_window_t {
+
+ } property_window_t;
+
++property_window_t *property_window_new_with_property_data(property_data_t
*property_data);
++
+ #endif /* _PROPERTY_WINDOW_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
2005-01-19 19:04:02.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
2009-01-12 10:27:02.000000000 -0700
+@@ -56,4 +56,6 @@ typedef struct _vkb_session_t {
+ int status_capslockkey:2;
+ } vkb_session_t;
+
++vkb_window_t *vkb_window_new();
++
+ #endif /* _VKB_AUX_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
+---
iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
2005-01-19 19:04:02.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
2009-01-12 10:27:02.000000000 -0700
+@@ -114,4 +114,8 @@ typedef struct _vkb_layout_t {
+ vkb_ctrlkey_label_t ctrlkey[MAX_CTRLKEY_NUM];
+ } vkb_layout_t;
+
++vkb_layout_t *vkb_layout_new();
++vkb_layout_t **vkb_layout_list_read_from_layout_file(char *layout_file_name);
++vkb_layout_t *vkb_layout_new_for_pc_keyboard();
++
+ #endif /* _VKB_LAYOUT_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/ime_module.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/ime_module.h
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/ime_module.h
2005-02-01 22:09:24.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/ime_module.h
2009-01-12 10:27:03.000000000 -0700
+@@ -50,4 +50,7 @@ typedef struct _ImeModuleContextRec {
+
+ } ImeModuleContextRec;
+
++ImeModuleRec *ime_module_new();
++ImeModuleContextRec *ime_module_context_new();
++
+ #endif /* _IME_MODULE_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_desktop.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_desktop.h
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_desktop.h
2005-03-15 02:55:42.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_desktop.h
2009-01-12 10:27:03.000000000 -0700
+@@ -38,4 +38,9 @@ typedef struct _LeDesktopContextRec {
+
+ } LeDesktopContextRec;
+
++LeDesktopContextRec *le_desktop_context_new();
++iml_session_t *le_desktop_context_get_current_session(LeDesktopContextRec *
++ le_desktop_context);
++char *le_desktop_profile_write_to_memory(LeDesktopContextRec * dc);
++
+ #endif /* _LE_DESKTOP_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_keybinding.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_keybinding.h
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_keybinding.h
2005-01-19 19:04:02.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_keybinding.h
2009-01-12 10:27:05.000000000 -0700
+@@ -18,4 +18,6 @@ typedef struct {
+ ImmKeyType defined_type;
+ } ImmKeybindingRec;
+
++ImmKeybindingRec *imm_keybinding_new();
++
+ #endif /* _LE_KEYBINDING_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_keyevent.c
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_keyevent.c
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_keyevent.c
2005-02-21 04:11:10.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_keyevent.c
2009-01-12 10:27:05.000000000 -0700
+@@ -15,6 +15,9 @@ int le_session_process_key_event_for_ime
+ int le_session_process_key_event_for_ime_manager(iml_session_t * s,
+ IMKeyEventStruct * key_event);
+
++char *get_qj_str(char ch);
++char *get_punct_str(char ch);
++
+ /* process the keyboard event */
+ LeResult le_session_process_key_event(iml_session_t * s,
+ IMKeyListEvent * keylistevent)
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_session.h
iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_session.h
+--- iiimf-12.3.91-svn2814.orig/leif/sch_le_sun/src/leif/le_session.h
2009-01-12 10:26:43.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sch_le_sun/src/leif/le_session.h
2009-01-12 10:27:06.000000000 -0700
+@@ -49,4 +49,16 @@ typedef struct _LeSessionContextRec {
+
+ IMText *le_session_reset(iml_session_t * s);
+
++LeSessionContextRec *le_session_context_new();
++IMText *le_session_reset(iml_session_t * s);
++TImePCAuxOption*
++session_get_pc_style(LeSessionContextRec* le_session_context);
++LeDesktopContextRec *le_session_get_desktop_context(iml_session_t * s);
++LeSessionContextRec *le_session_get_session_context(iml_session_t * s);
++ImeModuleRec *le_session_get_ime_module_by_uuid(iml_session_t * s,
++ char *uuid);
++ImeModuleRec *le_session_get_current_ime_module(iml_session_t * s);
++ImePropertyListRec *le_session_get_current_ime_module_property_list(
++ iml_session_t * s);
++ImeModuleRec *le_session_get_next_ime_module(iml_session_t * s);
+ #endif /* _LE_SESSION_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/palette_method.c
iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/palette_method.c
+--- iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/palette_method.c
2005-03-24 03:37:42.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/palette_method.c
2009-01-12 10:27:06.000000000 -0700
+@@ -23,6 +23,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <gdk/gdk.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/vkb_aux.h
iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/vkb_aux.h
+--- iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/vkb_aux.h
2005-03-24 03:37:42.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/vkb_aux.h
2009-01-12 10:27:06.000000000 -0700
+@@ -59,4 +59,6 @@ typedef struct _vkb_session_t {
+ int status_capslockkey:2;
+ } vkb_session_t;
+
++vkb_window_t *vkb_window_new();
++
+ #endif /* _VKB_AUX_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/vkb_layout.h
iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/vkb_layout.h
+--- iiimf-12.3.91-svn2814.orig/leif/sun_le_korea/auxwin_gtk/vkb_layout.h
2005-03-24 03:37:42.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/sun_le_korea/auxwin_gtk/vkb_layout.h
2009-01-12 10:27:06.000000000 -0700
+@@ -114,4 +114,7 @@ typedef struct _vkb_layout_t {
+ vkb_ctrlkey_label_t ctrlkey[MAX_CTRLKEY_NUM];
+ } vkb_layout_t;
+
++static vkb_layout_t *vkb_layout_new();
++vkb_layout_t **vkb_layout_list_read_from_layout_file(char *layout_file_name);
++
+ #endif /* _VKB_LAYOUT_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/include/imbean.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/include/imbean.h
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/include/imbean.h
2005-04-28 03:29:20.000000000 -0600
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/include/imbean.h 2009-01-12
10:27:06.000000000 -0700
+@@ -67,4 +67,7 @@ typedef struct _IbmlData {
+ IbmlCategoryPtr *categories;
+ } IbmlData;
+
++IbmlData *imbean_config_new_from_file(char *file_name);
++IbmlData *imbean_config_new_from_memory(char *buffer, int size);
++
+ #endif /* _IBML_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
2005-06-27 21:10:59.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.c
2009-01-12 10:27:07.000000000 -0700
+@@ -2,6 +2,7 @@
+ #include "palette_pixmap.h"
+ #include "palette_messages.h"
+ #include "palette_aux.h"
++#include "palette_menu.h"
+
+ enum {
+ BUTTON_STATE_NORMAL = 0,
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
2005-06-27 21:10:59.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_aux.h
2009-01-12 10:27:07.000000000 -0700
+@@ -134,4 +134,9 @@ typedef struct _palette_session_t {
+ char *ime_uuid;
+ } palette_session_t;
+
++palette_window_t *palette_window_new();
++palette_button_t *palette_window_get_button_from_pos(palette_window_t
*palette_window, int x, int y);
++vkb_layout_t *palette_window_get_current_ime_vkb_layout(palette_window_t
*palette_window);
++vkb_layout_t **palette_window_get_vkb_layout_list(palette_window_t
*palette_window);
++
+ #endif /* _PALETTE_AUX_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
1969-12-31 17:00:00.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/palette_menu.h
2009-01-12 10:27:07.000000000 -0700
+@@ -0,0 +1,18 @@
++#ifndef _PALETTE_MENU_H_
++#define _PALETTE_MENU_H_
++
++#include <stdio.h>
++#include <gdk/gdkx.h>
++#include <gtk/gtk.h>
++#include <signal.h>
++#include <wait.h>
++
++#include "palette_messages.h"
++#include "palette_aux.h"
++#include "vkb_aux.h"
++
++GtkWidget *palette_window_create_utility_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_update_utility_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_create_vkb_list_menu(palette_window_t
*palette_window);
++GtkWidget *palette_window_update_vkb_list_menu(palette_window_t
*palette_window);
++#endif
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_data.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_data.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_data.h
2005-06-27 21:10:59.000000000 -0600
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_data.h
2009-01-12 10:27:07.000000000 -0700
+@@ -62,4 +62,6 @@ enum {
+ PROPERTY_DATA_FOR_ALL
+ };
+
++property_data_t *property_data_new();
++
+ #endif /* _PROPERTY_DATA_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_window.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_window.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_window.h
2005-02-28 03:08:47.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/property_window.h
2009-01-12 10:27:07.000000000 -0700
+@@ -50,4 +50,6 @@ typedef struct _property_window_t {
+
+ } property_window_t;
+
++property_window_t *property_window_new_with_property_data(property_data_t
*property_data);
++
+ #endif /* _PROPERTY_WINDOW_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
2005-01-19 19:04:02.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_aux.h
2009-01-12 10:27:07.000000000 -0700
+@@ -56,4 +56,6 @@ typedef struct _vkb_session_t {
+ int status_capslockkey:2;
+ } vkb_session_t;
+
++vkb_window_t *vkb_window_new();
++
+ #endif /* _VKB_AUX_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
2005-01-19 19:04:02.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/auxiliary_windows/gtk2/vkb_layout.h
2009-01-12 10:27:07.000000000 -0700
+@@ -114,4 +114,8 @@ typedef struct _vkb_layout_t {
+ vkb_ctrlkey_label_t ctrlkey[MAX_CTRLKEY_NUM];
+ } vkb_layout_t;
+
++vkb_layout_t *vkb_layout_new();
++vkb_layout_t **vkb_layout_list_read_from_layout_file(char *layout_file_name);
++vkb_layout_t *vkb_layout_new_for_pc_keyboard();
++
+ #endif /* _VKB_LAYOUT_H_ */
+diff -urpN
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/input_methods/zhuyin/zhuyin_standard.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/input_methods/zhuyin/zhuyin_standard.h
+---
iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/input_methods/zhuyin/zhuyin_standard.h
2005-01-19 19:04:02.000000000 -0700
++++
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/input_methods/zhuyin/zhuyin_standard.h
2009-01-12 10:27:07.000000000 -0700
+@@ -54,4 +54,7 @@ enum {
+ ZHUYIN_TYPE_NUM,
+ };
+
++unsigned char *ZhuyinKeyToZhuyinSymbol(char key);
++unsigned char *ZhuyinIndexToZhuyinSymbol(int idx);
++
+ #endif /* _ZHUYIN_STANDARD_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/ime_module.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/ime_module.h
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/ime_module.h
2005-02-01 22:44:49.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/ime_module.h
2009-01-12 10:27:07.000000000 -0700
+@@ -50,4 +50,7 @@ typedef struct _ImeModuleContextRec {
+
+ } ImeModuleContextRec;
+
++ImeModuleRec *ime_module_new();
++ImeModuleContextRec *ime_module_context_new();
++
+ #endif /* _IME_MODULE_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_desktop.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_desktop.h
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_desktop.h
2005-03-15 02:53:32.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_desktop.h
2009-01-12 10:27:07.000000000 -0700
+@@ -38,4 +38,9 @@ typedef struct _LeDesktopContextRec {
+
+ } LeDesktopContextRec;
+
++LeDesktopContextRec *le_desktop_context_new();
++iml_session_t *le_desktop_context_get_current_session(LeDesktopContextRec *
++ le_desktop_context);
++char *le_desktop_profile_write_to_memory(LeDesktopContextRec * dc);
++
+ #endif /* _LE_DESKTOP_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_keybinding.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_keybinding.h
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_keybinding.h
2005-01-19 19:04:02.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_keybinding.h
2009-01-12 10:27:09.000000000 -0700
+@@ -18,4 +18,6 @@ typedef struct {
+ ImmKeyType defined_type;
+ } ImmKeybindingRec;
+
++ImmKeybindingRec *imm_keybinding_new();
++
+ #endif /* _LE_KEYBINDING_H_ */
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_keyevent.c
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_keyevent.c
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_keyevent.c
2005-02-21 04:13:44.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_keyevent.c
2009-01-12 10:27:09.000000000 -0700
+@@ -15,6 +15,9 @@ int le_session_process_key_event_for_ime
+ int le_session_process_key_event_for_ime_manager(iml_session_t * s,
+ IMKeyEventStruct * key_event);
+
++char *get_qj_str(char ch);
++char *get_punct_str(char ch);
++
+ /* process the keyboard event */
+ LeResult le_session_process_key_event(iml_session_t * s,
+ IMKeyListEvent * keylistevent)
+diff -urpN iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_session.h
iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_session.h
+--- iiimf-12.3.91-svn2814.orig/leif/tch_le_sun/src/leif/le_session.h
2009-01-12 10:26:43.000000000 -0700
++++ iiimf-12.3.91-svn2814/leif/tch_le_sun/src/leif/le_session.h
2009-01-12 10:27:10.000000000 -0700
+@@ -49,4 +49,16 @@ typedef struct _LeSessionContextRec {
+
+ IMText *le_session_reset(iml_session_t * s);
+
++LeSessionContextRec *le_session_context_new();
++IMText *le_session_reset(iml_session_t * s);
++TImePCAuxOption*
++session_get_pc_style(LeSessionContextRec* le_session_context);
++LeDesktopContextRec *le_session_get_desktop_context(iml_session_t * s);
++LeSessionContextRec *le_session_get_session_context(iml_session_t * s);
++ImeModuleRec *le_session_get_ime_module_by_uuid(iml_session_t * s,
++ char *uuid);
++ImeModuleRec *le_session_get_current_ime_module(iml_session_t * s);
++ImePropertyListRec *le_session_get_current_ime_module_property_list(
++ iml_session_t * s);
++ImeModuleRec *le_session_get_next_ime_module(iml_session_t * s);
+ #endif /* _LE_SESSION_H_ */
+--- iiimf-12.3.91-svn2814/leif/testEIMIL/testEIMIL.c~ 2004-06-30
07:51:55.000000000 -0600
++++ iiimf-12.3.91-svn2814/leif/testEIMIL/testEIMIL.c 2009-01-12
11:26:42.000000000 -0700
+@@ -61,6 +61,7 @@
+ void if_testEIMIL_SetSCFocus();
+ void if_testEIMIL_UnsetSCFocus();
+ void if_testEIMIL_SendEvent();
++void *EIMIL_get_private(EIMIL_handle eh);
+
+ /* IF Method */
+ if_methods_t testEIMIL_method_table = {
+--- iiimf-12.3.91-svn2814/lib/EIMIL/EIMIL.c~ 2005-06-16 06:21:16.000000000
-0600
++++ iiimf-12.3.91-svn2814/lib/EIMIL/EIMIL.c 2009-01-12 11:26:15.000000000
-0700
+@@ -3686,8 +3686,7 @@
+
+ void*
+ EIMIL_get_private(
+- EIMIL_handle eh,
+- void* private
++ EIMIL_handle eh
+ )
+ {
+ EIMIL_data *ped = (EIMIL_data*) eh;
