gtk+ r21158 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Tue Aug 19 19:16:38 2008
New Revision: 21158
URL: http://svn.gnome.org/viewvc/gtk+?rev=21158&view=rev

Log:
2008-08-19  BjÃrn Lindqvist  <bjourne gmail com>

	Bug 548354 â Remove repeated code in gtk_cell_view_size_allocate

	* gtk/gtkcellview.c (gtk_cell_view_size_allocate): Remove some
	code duplication, no need for separate loops for GTK_PACK_START
	and GTK_PACK_END.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcellview.c

Modified: trunk/gtk/gtkcellview.c
==============================================================================
--- trunk/gtk/gtkcellview.c	(original)
+++ trunk/gtk/gtkcellview.c	Tue Aug 19 19:16:38 2008
@@ -381,32 +381,15 @@
   else if (extra_space > 0 && expand_cell_count > 0)
     extra_space /= expand_cell_count;
 
-  /* iterate list for PACK_START cells */
   for (i = cellview->priv->cell_list; i; i = i->next)
     {
       GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
 
-      if (info->pack == GTK_PACK_END)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      info->real_width = info->requested_width + (info->expand?extra_space:0);
-    }
-
-  /* iterate list for PACK_END cells */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        continue;
-
       if (!info->cell->visible)
         continue;
 
-      info->real_width = info->requested_width + (info->expand?extra_space:0);
+      info->real_width = info->requested_width +
+        (info->expand ? extra_space : 0);
     }
 }