AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkTreeModelFilter: Fix build warnings

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=659441
This commit is contained in:
Xavier Claessens 2011-09-19 11:20:08 +02:00
parent 7bd7c02a11
commit 0561c7a68d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktreemodelfilter.c
View File

@ -1655,6 +1655,9 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter,
iter.user_data = level; iter.user_data = level;
iter.user_data2 = elt; iter.user_data2 = elt;
parent = level->parent_elt;
parent_level = level->parent_level;
if (!parent || orig_level_ext_ref_count > 0) if (!parent || orig_level_ext_ref_count > 0)
path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
else else
@ -1664,9 +1667,6 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter,
*/ */
path = NULL; path = NULL;
parent = level->parent_elt;
parent_level = level->parent_level;
length = g_sequence_get_length (level->seq); length = g_sequence_get_length (level->seq);
/* first register the node to be invisible */ /* first register the node to be invisible */
@ -3194,7 +3194,6 @@ static gboolean
gtk_tree_model_filter_iter_next (GtkTreeModel *model, gtk_tree_model_filter_iter_next (GtkTreeModel *model,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
FilterLevel *level;
FilterElt *elt; FilterElt *elt;
GSequenceIter *siter; GSequenceIter *siter;
@ -3202,7 +3201,6 @@ gtk_tree_model_filter_iter_next (GtkTreeModel *model,
g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE); g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE);
g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, FALSE); g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, FALSE);
level = iter->user_data;
elt = iter->user_data2; elt = iter->user_data2;
siter = g_sequence_iter_next (elt->visible_siter); siter = g_sequence_iter_next (elt->visible_siter);