[gtk+/rendering-cleanup: 5/30] API: remove gdk_window_set_icon()

[Benjamin Otte <otte src gnome org>]

commit 354118ea563d8ffeb6102d6b9cd6460e1120a10f
Author: Benjamin Otte <otte redhat com>
Date:   Thu Aug 12 04:48:06 2010 +0200

    API: remove gdk_window_set_icon()
    
    gdk_window_set_icon_list() now does everything gdk_window_set_icon()
    used to do.

 docs/reference/gdk/gdk3-sections.txt |    1 -
 gdk/directfb/gdkwindow-directfb.c    |   14 --------------
 gdk/gdk.symbols                      |    1 -
 gdk/gdkwindow.h                      |    4 ----
 gdk/quartz/gdkwindow-quartz.c        |    9 ---------
 gdk/win32/gdkwindow-win32.c          |   11 -----------
 gdk/x11/gdkwindow-x11.c              |   23 -----------------------
 7 files changed, 0 insertions(+), 63 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index de08736..c487711 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -508,7 +508,6 @@ gdk_window_get_children
 gdk_window_peek_children
 gdk_window_get_events
 gdk_window_set_events
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 26b6aae..4a42c95 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -1987,20 +1987,6 @@ gdk_window_set_icon_list (GdkWindow *window,
 }
 
 void
-gdk_window_set_icon (GdkWindow *window,
-                     GdkWindow *icon_window,
-                     GdkPixmap *pixmap,
-                     GdkBitmap *mask)
-{
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
-  /* N/A */
-}
-
-void
 gdk_window_set_icon_name (GdkWindow   *window,
                           const gchar *name)
 {
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 27f8f6a..ec79202 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -714,7 +714,6 @@ gdk_window_set_override_redirect
 gdk_window_set_accept_focus
 gdk_window_set_focus_on_map
 gdk_window_set_icon_list
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_opacity
 gdk_window_iconify
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index dcc42ac..51f745e 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -776,10 +776,6 @@ GdkEventMask  gdk_window_get_device_events (GdkWindow    *window,
 
 void          gdk_window_set_icon_list   (GdkWindow       *window,
 					  GList           *pixbufs);
-void	      gdk_window_set_icon	 (GdkWindow	  *window, 
-					  GdkWindow	  *icon_window,
-					  GdkPixmap	  *pixmap,
-					  GdkBitmap	  *mask);
 void	      gdk_window_set_icon_name	 (GdkWindow	  *window, 
 					  const gchar	  *name);
 void	      gdk_window_set_group	 (GdkWindow	  *window, 
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 12a5adb..8cbce96 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2293,15 +2293,6 @@ gdk_window_set_focus_on_map (GdkWindow *window,
 }
 
 void          
-gdk_window_set_icon (GdkWindow *window, 
-		     GdkWindow *icon_window,
-		     GdkPixmap *pixmap,
-		     GdkBitmap *mask)
-{
-  /* FIXME: Implement */
-}
-
-void          
 gdk_window_set_icon_name (GdkWindow   *window, 
 			  const gchar *name)
 {
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index d93e57e..f302428 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2308,17 +2308,6 @@ gdk_window_set_icon_list (GdkWindow *window,
   impl->hicon_small = small_hicon;
 }
 
-void          
-gdk_window_set_icon (GdkWindow *window, 
-		     GdkWindow *icon_window,
-		     GdkPixmap *pixmap,
-		     GdkBitmap *mask)
-{
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  /* do nothing, use gdk_window_set_icon_list instead */
-}
-
 void
 gdk_window_set_icon_name (GdkWindow   *window, 
 			  const gchar *name)
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 376db10..f3188e2 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -3849,29 +3849,6 @@ gdk_window_set_icon_list (GdkWindow *window,
   gdk_window_update_icon (window, pixbufs);
 }
 
-/**
- * gdk_window_set_icon:
- * @window: a toplevel #GdkWindow
- * @icon_window: a #GdkWindow to use for the icon, or %NULL to unset
- * @pixmap: a #GdkPixmap to use as the icon, or %NULL to unset
- * @mask: a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap, or %NULL to have none
- *
- * Sets the icon of @window as a pixmap or window. If using GTK+, investigate
- * gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list()
- * and gtk_window_set_icon(). If those don't meet your needs, look at
- * gdk_window_set_icon_list(). Only if all those are too high-level do you
- * want to fall back to gdk_window_set_icon().
- * 
- **/
-void          
-gdk_window_set_icon (GdkWindow *window, 
-		     GdkWindow *icon_window,
-		     GdkPixmap *pixmap,
-		     GdkBitmap *mask)
-{
-  return;
-}
-
 static gboolean
 gdk_window_icon_name_set (GdkWindow *window)
 {