[gtk+/gtk-2-24] Deprecate gtk_init_add, gtk_remove_add and friends

[Matthias Clasen <matthiasc src gnome org>]

commit 6a2524324f571a1da5314c6db9e6a778fe3b91a7
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Oct 16 00:14:00 2010 -0400

    Deprecate gtk_init_add, gtk_remove_add and friends
    
    This functions are going to be removed in GTK+ 3.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=629955

 docs/reference/gtk/tmpl/gtkmain.sgml |    7 ++++++-
 gtk/gtkmain.c                        |    3 ++-
 gtk/gtkmain.h                        |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index b235f06..185a37e 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -430,7 +430,7 @@ Registers a function to be called when the mainloop is started.
 
 @function: Function to invoke when gtk_main() is called next.
 @data: Data to pass to that function.
-
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 <!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
 <para>
@@ -440,6 +440,7 @@ is quit.
 
 @main_level: Level of the mainloop which shall trigger the destruction.
 @object: Object to be destroyed.
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_add ##### -->
@@ -455,6 +456,7 @@ Registers a function to be called when an instance of the mainloop is left.
 @data: Pointer to pass when calling @function.
 @Returns: A handle for this quit handler (you need this for gtk_quit_remove())
   or 0 if you passed a %NULL pointer in @function.
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_add_full ##### -->
@@ -481,6 +483,7 @@ used by GTK+ wrappers for languages other than C.
 @destroy: Function to call to destruct @data. Gets @data as argument.
 @Returns: A handle for this quit handler (you need this for gtk_quit_remove())
   or 0 if you passed a %NULL pointer in @function.
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_remove ##### -->
@@ -489,6 +492,7 @@ Removes a quit handler by its identifier.
 </para>
 
 @quit_handler_id: Identifier for the handler returned when installing it.
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_quit_remove_by_data ##### -->
@@ -497,6 +501,7 @@ Removes a quit handler identified by its @data field.
 </para>
 
 @data: The pointer passed as @data to gtk_quit_add() or gtk_quit_add_full().
+ Deprecated: This function is going to be removed in GTK+ 3.0
 
 
 <!-- ##### FUNCTION gtk_timeout_add_full ##### -->
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fdf4730..57888a0 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -26,6 +26,8 @@
 
 #include "config.h"
 
+#include "gtkmain.h"
+
 #include <glib.h>
 #include "gdkconfig.h"
 
@@ -52,7 +54,6 @@
 #include "gtkclipboard.h"
 #include "gtkdnd.h"
 #include "gtkversion.h"
-#include "gtkmain.h"
 #include "gtkmodules.h"
 #include "gtkrc.h"
 #include "gtkrecentmanager.h"
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 21de92e..3196e2c 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -156,6 +156,7 @@ void	   gtk_grab_add		   (GtkWidget	       *widget);
 GtkWidget* gtk_grab_get_current	   (void);
 void	   gtk_grab_remove	   (GtkWidget	       *widget);
 
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 void	   gtk_init_add		   (GtkFunction	       function,
 				    gpointer	       data);
 void	   gtk_quit_add_destroy	   (guint	       main_level,
@@ -170,7 +171,6 @@ guint	   gtk_quit_add_full	   (guint	       main_level,
 				    GDestroyNotify     destroy);
 void	   gtk_quit_remove	   (guint	       quit_handler_id);
 void	   gtk_quit_remove_by_data (gpointer	       data);
-#ifndef GTK_DISABLE_DEPRECATED
 guint	   gtk_timeout_add	   (guint32	       interval,
 				    GtkFunction	       function,
 				    gpointer	       data);