From 921fc8807c6a37b94ebb2b5397bf89f0557c718d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 15 Oct 2010 14:13:32 -0400
Subject: [PATCH] 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, 10 insertions(+), 2 deletions(-)

diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 302861cb07..f24198463d 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -437,7 +437,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>
@@ -447,6 +447,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 ##### -->
@@ -462,6 +463,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 ##### -->
@@ -488,6 +490,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 ##### -->
@@ -496,6 +499,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 ##### -->
@@ -504,6 +508,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
 
 
 <!-- ##### MACRO GTK_PRIORITY_RESIZE ##### -->
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 1dd2adeb5c..42ac35f1ca 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 04b9fd8941..dae07bf4a3 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -142,6 +142,7 @@ void       gtk_device_grab_add     (GtkWidget          *widget,
 void       gtk_device_grab_remove  (GtkWidget          *widget,
                                     GdkDevice          *device);
 
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 void	   gtk_init_add		   (GtkFunction	       function,
 				    gpointer	       data);
 void	   gtk_quit_add_destroy	   (guint	       main_level,
@@ -156,6 +157,7 @@ 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);
+#endif
 
 guint	   gtk_key_snooper_install (GtkKeySnoopFunc snooper,
 				    gpointer	    func_data);