diff --git a/ChangeLog b/ChangeLog index 803183296..cedf6b195 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-08-03 Anders Carlsson + + * glib/goption.h: + * glib/gtypes.h: + Move GTranslateFunc to gtypes.h + 2004-08-02 Anders Carlsson * glib/Makefile.am: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 803183296..cedf6b195 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-08-03 Anders Carlsson + + * glib/goption.h: + * glib/gtypes.h: + Move GTranslateFunc to gtypes.h + 2004-08-02 Anders Carlsson * glib/Makefile.am: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 803183296..cedf6b195 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2004-08-03 Anders Carlsson + + * glib/goption.h: + * glib/gtypes.h: + Move GTranslateFunc to gtypes.h + 2004-08-02 Anders Carlsson * glib/Makefile.am: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 803183296..cedf6b195 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-08-03 Anders Carlsson + + * glib/goption.h: + * glib/gtypes.h: + Move GTranslateFunc to gtypes.h + 2004-08-02 Anders Carlsson * glib/Makefile.am: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 803183296..cedf6b195 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-08-03 Anders Carlsson + + * glib/goption.h: + * glib/gtypes.h: + Move GTranslateFunc to gtypes.h + 2004-08-02 Anders Carlsson * glib/Makefile.am: diff --git a/glib/goption.h b/glib/goption.h index 2921253bd..0f42e16b8 100644 --- a/glib/goption.h +++ b/glib/goption.h @@ -26,10 +26,6 @@ G_BEGIN_DECLS -/* Should go into gtypes.h */ -typedef const gchar * (*GTranslateFunc) (const gchar *str, - gpointer data); - typedef struct _GOptionContext GOptionContext; typedef struct _GOptionGroup GOptionGroup; typedef struct _GOptionEntry GOptionEntry; diff --git a/glib/gtypes.h b/glib/gtypes.h index ce0fbcb57..4c132c8dd 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -87,6 +87,9 @@ typedef void (*GHFunc) (gpointer key, gpointer value, gpointer user_data); typedef void (*GFreeFunc) (gpointer data); +typedef const gchar * (*GTranslateFunc) (const gchar *str, + gpointer data); + /* Define some mathematical constants that aren't available * symbolically in some strict ISO C implementations.