From ce7379a8bda5c367ad1e7d52ce37e3ab02185910 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 28 Aug 2010 12:08:24 +0200
Subject: [PATCH] style: Remove depth member from GtkStyle

---
 gtk/gtkstyle.c | 6 ++----
 gtk/gtkstyle.h | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 464b5420ff..7e4172a7f8 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -402,7 +402,6 @@ gtk_style_init (GtkStyle *style)
   
   style->attach_count = 0;
   style->colormap = NULL;
-  style->depth = -1;
   
   style->black.red = 0;
   style->black.green = 0;
@@ -488,7 +487,7 @@ gtk_style_class_init (GtkStyleClass *klass)
    * @style: the object which received the signal
    *
    * Emitted when the style has been initialized for a particular
-   * colormap and depth. Connecting to this signal is probably seldom
+   * colormap. Connecting to this signal is probably seldom
    * useful since most of the time applications and widgets only
    * deal with styles that have been already realized.
    *
@@ -506,7 +505,7 @@ gtk_style_class_init (GtkStyleClass *klass)
    * @style: the object which received the signal
    *
    * Emitted when the aspects of the style specific to a particular colormap
-   * and depth are being cleaned up. A connection to this signal can be useful
+   * is being cleaned up. A connection to this signal can be useful
    * if a widget wants to cache objects as object data on #GtkStyle.
    * This signal provides a convenient place to free such cached objects.
    *
@@ -775,7 +774,6 @@ gtk_style_realize (GtkStyle    *style,
                    GdkColormap *colormap)
 {
   style->colormap = g_object_ref (colormap);
-  style->depth = gdk_colormap_get_visual (colormap)->depth;
 
   g_signal_emit (style, realize_signal, 0);
 }
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index f1c8399b35..69f52e3820 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -104,7 +104,6 @@ struct _GtkStyle
 
   gint attach_count;
 
-  gint depth;
   GdkColormap *colormap;
   PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
 
@@ -120,9 +119,9 @@ struct _GtkStyleClass
 {
   GObjectClass parent_class;
 
-  /* Initialize for a particular colormap/depth
-   * combination. style->colormap/style->depth will have
-   * been set at this point. Will typically chain to parent.
+  /* Initialize for a particular colormap. style->colormap
+   * will have been set at this point. Will typically chain
+   * to parent.
    */
   void (*realize)               (GtkStyle               *style);