[gtk+/gtk-2-24] Deprecate gdk_set_locale and gtk_set_locale

[Matthias Clasen <matthiasc src gnome org>]

commit e65e208d40a540a3508b56fe68f7a17aff48bc16
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 17 01:22:47 2010 -0500

    Deprecate gdk_set_locale and gtk_set_locale

 docs/reference/gdk/tmpl/general.sgml |    1 +
 gdk/gdk.h                            |    2 +-
 gdk/gdk.symbols                      |    2 +-
 gtk/gtk.symbols                      |    2 +-
 gtk/gtkmain.c                        |    2 ++
 gtk/gtkmain.h                        |    2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 2512595..3ef45ac 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -100,6 +100,7 @@ locale.
 
 @void: 
 @Returns: the resulting locale.
+ Deprecated:2.24: Use setlocale() directly
 
 
 <!-- ##### FUNCTION gdk_set_sm_client_id ##### -->
diff --git a/gdk/gdk.h b/gdk/gdk.h
index d834bb1..7096937 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -77,8 +77,8 @@ void gdk_pre_parse_libgtk_only          (void);
 
 #ifndef GDK_DISABLE_DEPRECATED
 void  	  gdk_exit		   	(gint	    	 error_code);
-#endif /* GDK_DISABLE_DEPRECATED */
 gchar*	  gdk_set_locale	   	(void);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 G_CONST_RETURN char *gdk_get_program_class (void);
 void                 gdk_set_program_class (const char *program_class);
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 0fccc7e..a0d0612 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -95,10 +95,10 @@ gdk_display_pointer_is_grabbed
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_mbstowcs
 gdk_wcstombs
-#endif
 gdk_set_locale
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 2cb713b..7e92fba 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2439,6 +2439,7 @@ gtk_get_current_event_state
 gtk_get_current_event_time
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_exit
+gtk_set_locale
 gtk_idle_add
 gtk_idle_add_full
 gtk_idle_add_priority
@@ -2454,7 +2455,6 @@ gtk_false G_GNUC_CONST
 gtk_true G_GNUC_CONST
 gtk_events_pending
 gtk_disable_setlocale
-gtk_set_locale
 gtk_check_version
 gtk_get_default_language
 gtk_get_event_widget
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ea32347..66a5a85 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1118,6 +1118,8 @@ gtk_exit (gint errorcode)
  * result of the setlocale(); it is also used on other machines, such as 
  * Windows, where the C library returns a different result. The string is 
  * owned by GTK+ and should not be modified or freed.
+ *
+ * Deprecated: 2.24: Use setlocale() directly
  **/
 gchar *
 gtk_set_locale (void)
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 3196e2c..4e378b6 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -129,10 +129,10 @@ gboolean gtk_init_check_abi_check (int	  *argc,
 
 #ifndef GTK_DISABLE_DEPRECATED
 void     gtk_exit                 (gint    error_code);
+gchar *        gtk_set_locale           (void);
 #endif /* GTK_DISABLE_DEPRECATED */
 
 void           gtk_disable_setlocale    (void);
-gchar *        gtk_set_locale           (void);
 PangoLanguage *gtk_get_default_language (void);
 gboolean       gtk_events_pending       (void);