From 47f8beb0a6069b1b0c8cba84f028797095f3ea99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 7 Jun 2010 04:31:56 +0200
Subject: [PATCH] Remove gdkx_colormap_get() deprecated function

---
 docs/reference/gdk/gdk3-sections.txt       |  1 -
 docs/reference/gdk/tmpl/x_interaction.sgml |  8 -----
 gdk/gdk.symbols                            |  3 --
 gdk/x11/gdkcolor-x11.c                     | 35 ----------------------
 gdk/x11/gdkx.h                             |  5 ----
 5 files changed, 52 deletions(-)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index f163c52ed0..da9208c9e9 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -1335,7 +1335,6 @@ GDK_GC_XGC
 GDK_GC_GET_XGC
 GDK_WINDOW_XWINDOW
 gdkx_visual_get
-gdkx_colormap_get
 gdk_pixmap_foreign_new
 gdk_pixmap_foreign_new_for_display
 gdk_pixmap_foreign_new_for_screen
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 38a2e6f6c5..6d3620df74 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -249,14 +249,6 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdkx_colormap_get ##### -->
-<para>
-</para>
-
-@xcolormap: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_pixmap_foreign_new ##### -->
 <para>
 
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index d114d6e357..971bc61a46 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -1251,9 +1251,6 @@ gdk_x11_xatom_to_atom_for_display
 gdk_x11_colormap_foreign_new
 gdk_x11_colormap_get_xcolormap
 gdk_x11_colormap_get_xdisplay
-#ifdef GDK_ENABLE_BROKEN
-gdkx_colormap_get
-#endif
 #endif
 
 #if IN_FILE(__GDK_CURSOR_X11_C__)
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 8cb5fb8f9d..e71038f713 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -1151,41 +1151,6 @@ gdk_x11_colormap_foreign_new (GdkVisual *visual,
   
 }
 
-/**
- * gdkx_colormap_get:
- * @xcolormap: the XID of a colormap for the default screen.
- * 
- * Returns a #GdkColormap corresponding to a X colormap;
- * this function only works if the colormap is already
- * known to GTK+ (a colormap created by GTK+ or the default
- * colormap for the screen), since GTK+ 
- *
- * Always use gdk_x11_colormap_foreign_new() instead.
- *
- * Return value: the existing #GdkColormap object if it was
- *  already known to GTK+, otherwise warns and return
- *  %NULL.
- **/
-GdkColormap*
-gdkx_colormap_get (Colormap xcolormap)
-{
-  GdkScreen *screen = gdk_screen_get_default ();
-  GdkColormap *colormap;
-
-  if (xcolormap == DefaultColormap (GDK_SCREEN_XDISPLAY (screen),
-				    GDK_SCREEN_XNUMBER (screen)))
-    return g_object_ref (gdk_screen_get_system_colormap (screen));
-
-  colormap = gdk_colormap_lookup (screen, xcolormap);
-  if (colormap)
-    return g_object_ref (colormap);
-
-  g_warning ("Colormap passed to gdkx_colormap_get\n"
-	     "does not previously exist");
-
-  return NULL;
-}
-
 static gint
 gdk_colormap_match_color (GdkColormap *cmap,
 			  GdkColor    *color,
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index d8aa42c843..c56d462996 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -129,11 +129,6 @@ GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
 GdkVisual* gdkx_visual_get            (VisualID   xvisualid);
 #endif
 
-#ifdef GDK_ENABLE_BROKEN
-/* XXX: An X Colormap is useless unless we also have the visual. */
-GdkColormap* gdkx_colormap_get (Colormap xcolormap);
-#endif
-
 GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
 					   Colormap   xcolormap);