[gtk+/gtk-2-24] Deprecate GtkCallbackMarshal and GtkFunction

[Javier Jardón <jjardon src gnome org>]

commit 70929bc7ba48b9266448094b96f274167e2a8844
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Nov 16 07:24:22 2010 +0100

    Deprecate GtkCallbackMarshal and GtkFunction
    
    As they're only used by already deprecated API
    
    https://bugzilla.gnome.org/show_bug.cgi?id=629955

 docs/reference/gtk/tmpl/gtktypeutils.sgml |    2 ++
 gtk/gtktypeutils.h                        |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index a4f3df4..d8ac444 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -179,6 +179,7 @@ Defines a function pointer.
 
 @data: #gpointer
 @Returns: #gint
+ Deprecated: 2.24: Use GSourceFunc() instead.
 
 
 <!-- ##### USER_FUNCTION GtkDestroyNotify ##### -->
@@ -198,6 +199,7 @@ Defines a function pointer.
 @data: #gpointer
 @n_args: #guint
 @args: #GtkArg*
+ Deprecated: 2.24:
 
 
 <!-- ##### TYPEDEF GtkSignalMarshaller ##### -->
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 48b664c..9737d3b 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -47,11 +47,13 @@ GType gtk_identifier_get_type (void) G_GNUC_CONST;
  */
 typedef struct _GtkArg	       	     GtkArg;
 typedef struct _GtkObject   	     GtkObject; /* object forward declaration */
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 typedef gboolean (*GtkFunction)	    (gpointer      data);
 typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
 				     gpointer      data,
 				     guint         n_args,
 				     GtkArg       *args);
+#endif
 
 /* This used to be defined in gtkitemfactory.h, but moved over here after
  * the complete deprecation of that header