From 019563c3228792bec758f6a55a99b0c9c702d023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 26 May 2010 01:41:40 +0200
Subject: [PATCH] Remove gdk_*et_use_xshm() deprecated functions

---
 docs/reference/gdk/gdk3-sections.txt |  4 ----
 docs/reference/gdk/tmpl/general.sgml | 27 ---------------------------
 gdk/directfb/gdkmain-directfb.c      | 11 -----------
 gdk/gdk.h                            |  5 -----
 gdk/gdk.symbols                      |  4 ----
 gdk/quartz/gdkmain-quartz.c          | 13 -------------
 gdk/win32/gdkmain-win32.c            | 12 ------------
 gdk/x11/gdkmain-x11.c                | 11 -----------
 8 files changed, 87 deletions(-)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index ff8f15d84b..f0de4c82c8 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -44,10 +44,6 @@ gdk_keyboard_ungrab
 <SUBSECTION>
 gdk_beep
 
-<SUBSECTION>
-gdk_get_use_xshm
-gdk_set_use_xshm
-
 <SUBSECTION>
 gdk_error_trap_push
 gdk_error_trap_pop
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 1e37b60eb1..a2aaf3d711 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -327,33 +327,6 @@ available.
 @void: 
 
 
-<!-- ##### FUNCTION gdk_get_use_xshm ##### -->
-<para>
-Returns %TRUE if GDK will attempt to use the MIT-SHM shared memory extension.
-</para>
-<para>
-The shared memory extension is used for #GdkImage, and consequently for
-<link linkend="gdk-GdkRGB">GdkRGB</link>.
-It enables much faster drawing by communicating with the X server through
-SYSV shared memory calls. However, it can only be used if the X client and
-server are on the same machine and the server supports it.
-</para>
-
-@void: 
-@Returns: %TRUE if use of the MIT shared memory extension will be attempted.
-
-
-<!-- ##### FUNCTION gdk_set_use_xshm ##### -->
-<para>
-Sets whether the use of the MIT shared memory extension should be attempted.
-This function is mainly for internal use. It is only safe for an application
-to set this to %FALSE, since if it is set to %TRUE and the server does not
-support the extension it may cause warning messages to be output.
-</para>
-
-@use_xshm: %TRUE if use of the MIT shared memory extension should be attempted.
-
-
 <!-- ##### FUNCTION gdk_error_trap_push ##### -->
 <para>
 This function allows X errors to be trapped instead of the normal behavior
diff --git a/gdk/directfb/gdkmain-directfb.c b/gdk/directfb/gdkmain-directfb.c
index 05aa0429de..0e9b873fce 100644
--- a/gdk/directfb/gdkmain-directfb.c
+++ b/gdk/directfb/gdkmain-directfb.c
@@ -63,17 +63,6 @@ _gdk_windowing_init (void)
    */
 }
 
-void
-gdk_set_use_xshm (gboolean use_xshm)
-{
-}
-
-gboolean
-gdk_get_use_xshm (void)
-{
-  return FALSE;
-}
-
 void
 _gdk_windowing_display_set_sm_client_id (GdkDisplay *display,const gchar *sm_client_id)
 {
diff --git a/gdk/gdk.h b/gdk/gdk.h
index e910a8b23c..89a9a8b4a6 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -88,11 +88,6 @@ void                 gdk_set_program_class (const char *program_class);
 void      gdk_error_trap_push           (void);
 gint      gdk_error_trap_pop            (void);
 
-#ifndef GDK_DISABLE_DEPRECATED
-void	  gdk_set_use_xshm		(gboolean	 use_xshm);
-gboolean  gdk_get_use_xshm		(void);
-#endif /* GDK_DISABLE_DEPRECATED */
-
 gchar*	                  gdk_get_display		(void);
 G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
 
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 9ee4082d8f..379ec2887f 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -100,10 +100,6 @@ gdk_device_manager_xi2_get_type
 gdk_error_trap_pop
 gdk_error_trap_push
 gdk_get_display
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_get_use_xshm
-gdk_set_use_xshm
-#endif
 #endif
 #endif
 
diff --git a/gdk/quartz/gdkmain-quartz.c b/gdk/quartz/gdkmain-quartz.c
index 6e82478ea2..af765d02b1 100644
--- a/gdk/quartz/gdkmain-quartz.c
+++ b/gdk/quartz/gdkmain-quartz.c
@@ -86,16 +86,3 @@ _gdk_windowing_display_set_sm_client_id (GdkDisplay  *display,
 					 const gchar *sm_client_id)
 {
 }
-
-void
-gdk_set_use_xshm (gboolean use_xshm)
-{
-  /* Always on, since we're always on the local machine */
-}
-
-gboolean
-gdk_get_use_xshm (void)
-{
-  return TRUE;
-}
-
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 4ea4c8fbe2..e2fd628c82 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -152,18 +152,6 @@ _gdk_other_api_failed (const gchar *where,
   g_warning ("%s: %s failed", where, api);
 }
 
-void
-gdk_set_use_xshm (gboolean use_xshm)
-{
-  /* Always on */
-}
-
-gboolean
-gdk_get_use_xshm (void)
-{
-  return TRUE;
-}
-
 gint
 gdk_screen_get_width (GdkScreen *screen)
 {
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index bf53d6552c..d876fd4db7 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -107,17 +107,6 @@ _gdk_windowing_init (void)
   _gdk_selection_property = gdk_atom_intern_static_string ("GDK_SELECTION");
 }
 
-void
-gdk_set_use_xshm (gboolean use_xshm)
-{
-}
-
-gboolean
-gdk_get_use_xshm (void)
-{
-  return GDK_DISPLAY_X11 (gdk_display_get_default ())->use_xshm;
-}
-
 GdkGrabStatus
 _gdk_x11_convert_grab_status (gint status)
 {