From 08f8e56701977d8d3c5a67b22047019633ba6375 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:13:24 +0000 Subject: Merged changes from RELEASE-1 branch --- modules/im/ximcp/imDefIc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/im/ximcp/imDefIc.c') diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c index 63cd63e..8f3257e 100644 --- a/modules/im/ximcp/imDefIc.c +++ b/modules/im/ximcp/imDefIc.c @@ -1212,7 +1212,7 @@ _XimProtoWcReset( } Private char * -_XFree86imCommitedUtf8String( +_XimCommitedUtf8String( Xim im, Xic ic, XPointer buf) @@ -1262,10 +1262,10 @@ Error_On_Reset: } Private char * -_XFree86imProtoUtf8Reset( +_XimProtoUtf8Reset( XIC xic) { - return _XimProtoReset(xic, _XFree86imCommitedUtf8String); + return _XimProtoReset(xic, _XimCommitedUtf8String); } Private XICMethodsRec ic_methods = { @@ -1276,10 +1276,10 @@ Private XICMethodsRec ic_methods = { _XimProtoGetICValues, /* get_values */ _XimProtoMbReset, /* mb_reset */ _XimProtoWcReset, /* wc_reset */ - _XFree86imProtoUtf8Reset, /* utf8_reset */ + _XimProtoUtf8Reset, /* utf8_reset */ _XimProtoMbLookupString, /* mb_lookup_string */ _XimProtoWcLookupString, /* wc_lookup_string */ - _XFree86imProtoUtf8LookupString /* utf8_lookup_string */ + _XimProtoUtf8LookupString /* utf8_lookup_string */ }; Private Bool -- cgit v1.2.3