summaryrefslogtreecommitdiff
path: root/gtk/gtktreeview.c
diff options
context:
space:
mode:
authorJonathan Blandford <jrb@src.gnome.org>2001-08-19 06:58:11 +0000
committerJonathan Blandford <jrb@src.gnome.org>2001-08-19 06:58:11 +0000
commit112eb9b2e52a139c842588ed45baa38faf1e7fb3 (patch)
tree410731bf8362a945a034a2041e8039df0e18733b /gtk/gtktreeview.c
parent6ffd507deabb9e5b4445c8ff1e99910716d9cad0 (diff)
downloadgtk+-112eb9b2e52a139c842588ed45baa38faf1e7fb3.tar.gz
Sun Aug 19 01:44:44 2001 Jonathan Blandford <jrb@redhat.com>>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell. * gtk/gtktreeview.c (gtk_tree_view_insert_column): sink column. (_gtk_tree_view_find_node): If *node is NULL, *tree should be NULL too. * demos/gtk-demo/stock_browser.c (do_stock_browser): don't unref column/renderers. * tests/testtreecolumns.c: ditto * tests/testtreefocus.c: ditto * tests/testtreesort.c: ditto * tests/testtreeview.c: ditto * tests/treestoretest.c: ditto
Diffstat (limited to 'gtk/gtktreeview.c')
-rw-r--r--gtk/gtktreeview.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 54d87a2f28..706ec2646e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5215,7 +5215,10 @@ _gtk_tree_view_find_node (GtkTreeView *tree_view,
if (tmptree == NULL)
{
*node = tmpnode;
- *tree = tmptree;
+ if (tmpnode == NULL)
+ *tree = NULL;
+ else
+ *tree = tmptree;
return TRUE;
}
tmpnode = _gtk_rbtree_find_count (tmptree, indices[i] + 1);
@@ -5223,7 +5226,10 @@ _gtk_tree_view_find_node (GtkTreeView *tree_view,
if (i >= depth)
{
*node = tmpnode;
- *tree = tmptree;
+ if (tmpnode == NULL)
+ *tree = NULL;
+ else
+ *tree = tmptree;
return FALSE;
}
tmptree = tmpnode->children;
@@ -6681,6 +6687,7 @@ gtk_tree_view_insert_column (GtkTreeView *tree_view,
g_return_val_if_fail (column->tree_view == NULL, -1);
g_object_ref (G_OBJECT (column));
+ gtk_object_sink (GTK_OBJECT (column));
if (tree_view->priv->n_columns == 0 &&
GTK_WIDGET_REALIZED (tree_view) &&
@@ -6762,7 +6769,6 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view,
va_end (args);
gtk_tree_view_insert_column (tree_view, column, position);
- g_object_unref (column);
return tree_view->priv->n_columns;
}
@@ -6805,8 +6811,6 @@ gtk_tree_view_insert_column_with_data_func (GtkTreeView *tree_vie
gtk_tree_view_insert_column (tree_view, column, position);
- g_object_unref (column);
-
return tree_view->priv->n_columns;
}