projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/widgets/modest-header-view.c:
[modest]
/
src
/
widgets
/
modest-vbox-cell-renderer.c
diff --git
a/src/widgets/modest-vbox-cell-renderer.c
b/src/widgets/modest-vbox-cell-renderer.c
index
323dce0
..
af26450
100644
(file)
--- 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));
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));
g_object_ref_sink (G_OBJECT (cell));
+#else
+ g_object_ref (G_OBJECT (cell));
+ gtk_object_sink (GTK_OBJECT (cell));
+#endif
}
static void
}
static void
@@
-259,14
+265,11
@@
modest_vbox_cell_renderer_render (GtkCellRenderer *cell,
GList *node = NULL;
GtkCellRenderer *child;
gint height, extra;
GList *node = NULL;
GtkCellRenderer *child;
gint height, extra;
- GtkRequisition req;
direction = gtk_widget_get_direction (widget);
nvis_children = 0;
nexpand_children = 0;
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)) {
/* 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) {
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 {
height = cell_area->height - req.height;
extra = height / nexpand_children;
} else {