From: Matthias Clasen Date: Tue, 4 May 2004 17:05:20 +0000 (+0000) Subject: Fix the recent string_conversion_callback change to work on Solaris. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=ecd0c58e35d57c4f54cee3cc7decaed529116c46;hp=2a3d687b8f84089c2a7fa703ec5c91da2cd3c206;p=~andy%2Fgtk Fix the recent string_conversion_callback change to work on Solaris. 2004-05-04 Matthias Clasen * modules/input/gtkimcontextxim.c: Fix the recent string_conversion_callback change to work on Solaris. (#141190, Padraig O'Briain) --- diff --git a/ChangeLog b/ChangeLog index fdc0c786e..26285596f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-05-04 Matthias Clasen + * modules/input/gtkimcontextxim.c: Fix the recent + string_conversion_callback change to work on + Solaris. (#141190, Padraig O'Briain) + * gtk/gtkselection.c: Disable debug logging again. 2004-05-03 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fdc0c786e..26285596f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-05-04 Matthias Clasen + * modules/input/gtkimcontextxim.c: Fix the recent + string_conversion_callback change to work on + Solaris. (#141190, Padraig O'Briain) + * gtk/gtkselection.c: Disable debug logging again. 2004-05-03 Matthias Clasen diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fdc0c786e..26285596f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2004-05-04 Matthias Clasen + * modules/input/gtkimcontextxim.c: Fix the recent + string_conversion_callback change to work on + Solaris. (#141190, Padraig O'Briain) + * gtk/gtkselection.c: Disable debug logging again. 2004-05-03 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fdc0c786e..26285596f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-05-04 Matthias Clasen + * modules/input/gtkimcontextxim.c: Fix the recent + string_conversion_callback change to work on + Solaris. (#141190, Padraig O'Briain) + * gtk/gtkselection.c: Disable debug logging again. 2004-05-03 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fdc0c786e..26285596f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-05-04 Matthias Clasen + * modules/input/gtkimcontextxim.c: Fix the recent + string_conversion_callback change to work on + Solaris. (#141190, Padraig O'Briain) + * gtk/gtkselection.c: Disable debug logging again. 2004-05-03 Matthias Clasen diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index ce5d84df9..ad389b5ad 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -64,7 +64,7 @@ struct _GtkIMContextXIM XIMCallback status_done_callback; XIMCallback status_draw_callback; - XICCallback string_conversion_callback; + XIMCallback string_conversion_callback; XIC ic; @@ -1358,7 +1358,7 @@ set_string_conversion_callback (GtkIMContextXIM *context_xim, XIC xic) return; context_xim->string_conversion_callback.client_data = (XPointer)context_xim; - context_xim->string_conversion_callback.callback = (XICProc)string_conversion_callback; + context_xim->string_conversion_callback.callback = (XIMProc)string_conversion_callback; XSetICValues (xic, XNStringConversionCallback,