From 890e4511aaf3ef0ef72328fd7b89440e49de94d2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 13 Jan 2011 16:30:28 -0500
Subject: [PATCH] GtkContainer: make "handle_border_width" member private

Otherwise in introspection we get a naming conflict between the
structure member and the method.

http://bugzilla.gnome.org/show_bug.cgi?id=639325
---
 gtk/gtkcontainer.c | 6 +++---
 gtk/gtkcontainer.h | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index d5135209cd..cd400b3e02 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1766,7 +1766,7 @@ gtk_container_adjust_size_request (GtkWidget         *widget,
 
   container = GTK_CONTAINER (widget);
 
-  if (GTK_CONTAINER_GET_CLASS (widget)->handle_border_width)
+  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
     {
       int border_width;
 
@@ -1796,7 +1796,7 @@ gtk_container_adjust_size_allocation (GtkWidget         *widget,
 
   container = GTK_CONTAINER (widget);
 
-  if (!GTK_CONTAINER_GET_CLASS (widget)->handle_border_width)
+  if (!GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
     {
       parent_class->adjust_size_allocation (widget, orientation,
 					    minimum_size, natural_size, allocated_pos,
@@ -1859,7 +1859,7 @@ gtk_container_class_handle_border_width (GtkContainerClass *klass)
 {
   g_return_if_fail (GTK_IS_CONTAINER_CLASS (klass));
 
-  klass->handle_border_width = TRUE;
+  klass->_handle_border_width = TRUE;
 }
 
 /**
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 94a8502c8f..2498513dd0 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -62,8 +62,6 @@ struct _GtkContainerClass
 {
   GtkWidgetClass parent_class;
 
-  unsigned int handle_border_width : 1;
-
   void    (*add)       		(GtkContainer	 *container,
 				 GtkWidget	 *widget);
   void    (*remove)    		(GtkContainer	 *container,
@@ -91,6 +89,11 @@ struct _GtkContainerClass
   GtkWidgetPath * (*get_path_for_child) (GtkContainer *container,
                                          GtkWidget    *child);
 
+
+  /*< private >*/
+
+  unsigned int _handle_border_width : 1;
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);