[maemo-commits] [maemo-commits] r11063 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-04-16 14:45:38 +0300 (Mon, 16 Apr 2007)
New Revision: 11063

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
Log:
	* src/sapwood-draw.c (draw_simple_image): Don't take internal children
	into account for the position theming.


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-04-16 11:26:53 UTC (rev 11062)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-04-16 11:45:38 UTC (rev 11063)
@@ -1,3 +1,8 @@
+2007-04-16  Xan Lopez  <xan.lopez at nokia.com>
+
+	* src/sapwood-draw.c (draw_simple_image): Don't take internal children
+	into account for the position theming.
+
 2007-04-13  Xan Lopez  <xan.lopez at nokia.com>
 
 	* src/sapwood-draw.c: Add general positioning theming based on GTK+

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-04-16 11:26:53 UTC (rev 11062)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-04-16 11:45:38 UTC (rev 11063)
@@ -213,28 +213,6 @@
   g_list_free (children);
 }
 
-static void
-gtk_container_children_callback (GtkWidget *widget,
-				 gpointer   client_data)
-{
-  GList **children;
-
-  children = (GList**) client_data;
-  *children = g_list_prepend (*children, widget);
-}
-
-static GList *
-gtk_container_get_all_children (GtkContainer *container)
-{
-  GList *children = NULL;
-
-  gtk_container_forall (container,
-			gtk_container_children_callback,
-			&children);
-
-  return children;
-}
-
 static gboolean
 draw_simple_image(GtkStyle       *style,
 		  GdkWindow      *window,
@@ -279,9 +257,10 @@
 	    check_buttonbox_child_position (widget, match_data);
 	  else
 	    {
+              /* Generic code for other kinds of containers */
 	      GList *children;
 
-	      children = gtk_container_get_all_children (widget->parent);
+	      children = gtk_container_get_children (widget->parent);
 	      check_child_position (widget, children, match_data);
 	      g_list_free (children);
 	    }