* #10736: calltree: check if element is conference before treating it as such

gnome/src/contacts/calltree.c

@@ -595,14 +595,15 @@ calltree_update_call_recursive(calltab_t* tab, callable_obj_t * call, GtkTreeIte
     }
 
     for (gint i = 0; i < nbChild; i++) {
+        GtkTreeModel *model = GTK_TREE_MODEL(store);
+        if (gtk_tree_model_iter_nth_child(model, &iter, parent, i)) {
 
-        if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, parent, i)) {
-
-            if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
+            if (is_conference(model, &iter)) {
                 calltree_update_call_recursive(tab, call, &iter);
+            } else {
 
                 gchar *id;
-            gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, COLUMN_ID, &id, -1);
+                gtk_tree_model_get(model, &iter, COLUMN_ID, &id, -1);
 
                 callable_obj_t * iterCall = calllist_get_call(tab, id);
                 g_free(id);
@@ -720,6 +721,7 @@ calltree_update_call_recursive(calltab_t* tab, callable_obj_t * call, GtkTreeIte
                     g_object_unref(G_OBJECT(pixbuf_security));
             }
         }
+    }
 
     update_actions();
 }
@@ -1043,6 +1045,7 @@ void calltree_remove_conference_recursive(calltab_t* tab, const conference_obj_t
             if (gtk_tree_model_iter_has_child(model, &iter_parent))
                 calltree_remove_conference_recursive(tab, conf, &iter_parent);
 
+            if (is_conference(model, &iter_parent)) {
                 gchar *conf_id;
                 gtk_tree_model_get(model, &iter_parent, COLUMN_ID, &conf_id, -1);
 
@@ -1075,6 +1078,7 @@ void calltree_remove_conference_recursive(calltab_t* tab, const conference_obj_t
                 }
             }
         }
+    }
 
     if (calltab_get_selected_conf(tab) == conf)
         calltab_select_conf(tab, NULL);