[maemo-commits] [maemo-commits] r13903 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-18 18:33:50 +0300 (Tue, 18 Sep 2007)
New Revision: 13903

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkhbbox.c
Log:
Return quickly when there are zero visible children.

2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkhbbox.c (gtk_hbutton_box_get_children_sizes,
	gtk_hbutton_box_size_allocate): Return quickly when there are zero
	visible children.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-18 15:08:53 UTC (rev 13902)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-18 15:33:50 UTC (rev 13903)
@@ -1,5 +1,11 @@
 2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* gtk/gtkhbbox.c (gtk_hbutton_box_get_children_sizes,
+	gtk_hbutton_box_size_allocate): Return quickly when there are zero
+	visible children.
+
+2007-09-18  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* gtk/gtkhbbox.c (gtk_hbutton_box_size_allocate): Fix spacings in
 	GTK_BUTTONBOX_EDGE case which got broken by NB#63578.
 

Modified: projects/haf/trunk/gtk+/gtk/gtkhbbox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-09-18 15:08:53 UTC (rev 13902)
+++ projects/haf/trunk/gtk+/gtk/gtkhbbox.c	2007-09-18 15:33:50 UTC (rev 13903)
@@ -200,6 +200,11 @@
                                      n_secondaries,
                                      &child_width,
                                      child_height);
+  if (*nvis_children == 0)
+    {
+      *primary_width = *secondary_width = *n_secondaries = 0;
+      return NULL;
+    }
 
   children_widths = g_slice_alloc (sizeof (gint) * (*nvis_children));
 
@@ -314,6 +319,8 @@
 							&child_height,
 							&nvis_children,
 							&n_secondaries);
+  if (nvis_children == 0)
+    return;
 
   n_primaries = nvis_children - n_secondaries;
   inner_width = allocation->width - 2 * GTK_CONTAINER (widget)->border_width;