X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-vbox-cell-renderer.c;h=af26450385f167d4396e2f515114a8d084a88557;hb=f0514c2abde3ab8118925f467e51949017e02153;hp=323dce03032dc32b1fcdd6cbb60561bfcf35f5bf;hpb=32aa324fb6312e9a86f9b244f63178fa1807043d;p=modest

diff --git a/src/widgets/modest-vbox-cell-renderer.c b/src/widgets/modest-vbox-cell-renderer.c
index 323dce0..af26450 100644
--- a/src/widgets/modest-vbox-cell-renderer.c
+++ b/src/widgets/modest-vbox-cell-renderer.c
@@ -183,7 +183,13 @@ modest_vbox_cell_renderer_append (ModestVBoxCellRenderer *vbox_renderer,
 	
 	priv->renderers_list = g_list_append (priv->renderers_list, cell);
 	g_object_set_data (G_OBJECT (cell), RENDERER_EXPAND_ATTRIBUTE, GINT_TO_POINTER (expand));
+
+#if GLIB_CHECK_VERSION(2, 10, 0) /* g_object_ref_sink() was added in glib 2.10: */
 	g_object_ref_sink (G_OBJECT (cell));
+#else
+	g_object_ref (G_OBJECT (cell));
+	gtk_object_sink (GTK_OBJECT (cell));
+#endif
 }
 
 static void 
@@ -259,14 +265,11 @@ modest_vbox_cell_renderer_render       (GtkCellRenderer       *cell,
 	GList *node = NULL;
 	GtkCellRenderer *child;
 	gint height, extra;
-	GtkRequisition req;
 	
 	direction = gtk_widget_get_direction (widget);
 	nvis_children = 0;
 	nexpand_children = 0;
 
-	/* first, retrieve the requisition of the children cell renderers */
-	modest_vbox_cell_renderer_get_size (cell, widget, NULL, NULL, NULL, &(req.width), &(req.height));
 
 	/* Counts visible and expandable children cell renderers */
 	for (node = priv->renderers_list; node != NULL; node = g_list_next (node)) {
@@ -288,6 +291,9 @@ modest_vbox_cell_renderer_render       (GtkCellRenderer       *cell,
 		GdkRectangle child_alloc;
 
 		if (nexpand_children > 0) {
+			GtkRequisition req;
+			
+			modest_vbox_cell_renderer_get_size (cell, widget, NULL, NULL, NULL, &(req.width), &(req.height));
 			height = cell_area->height - req.height;
 			extra = height / nexpand_children;
 		} else {