Fix the recent string_conversion_callback change to work on Solaris.

2004-05-04  Matthias Clasen  <mclasen@redhat.com>

	* 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 fdc0c786e6e8fad1c9e862f2faa5fb275c92c08f..26285596fd17e66991ff081c0a3215c55dd8306d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fdc0c786e6e8fad1c9e862f2faa5fb275c92c08f..26285596fd17e66991ff081c0a3215c55dd8306d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fdc0c786e6e8fad1c9e862f2faa5fb275c92c08f..26285596fd17e66991ff081c0a3215c55dd8306d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,9 @@
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fdc0c786e6e8fad1c9e862f2faa5fb275c92c08f..26285596fd17e66991ff081c0a3215c55dd8306d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fdc0c786e6e8fad1c9e862f2faa5fb275c92c08f..26285596fd17e66991ff081c0a3215c55dd8306d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-05-04  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index ce5d84df93a3c7d184fd2172a1caf8407d035088..ad389b5adff3bb38fcf3b31c48fe88053283f749 100644 (file)
--- 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,