* #7178: calls added to history will never have a parent

gnome/src/actions.c

@@ -1098,7 +1098,7 @@ void sflphone_fill_history(void)
         QueueElement *element = calllist_get_nth(history_tab, i);
 
         if (element->type == HIST_CALL)
-            calltree_add_history_entry(element->elem.call, NULL);
+            calltree_add_history_entry(element->elem.call);
     }
 }
 

gnome/src/contacts/calllist.c

@@ -160,7 +160,7 @@ calllist_remove_call(calltab_t* tab, const gchar * callID)
     g_queue_remove(tab->callQueue, element);
 
     calllist_add_call(history_tab, element->elem.call);
-    calltree_add_history_entry(element->elem.call, NULL);
+    calltree_add_history_entry(element->elem.call);
 }
 
 

gnome/src/contacts/calltree.c

@@ -845,7 +845,7 @@ void calltree_add_call(calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
     gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view)), &iter);
 }
 
-void calltree_add_history_entry(callable_obj_t *c, GtkTreeIter *parent)
+void calltree_add_history_entry(callable_obj_t *c)
 {
     if (!eel_gconf_get_integer(HISTORY_ENABLED))
         return;
@@ -854,12 +854,10 @@ void calltree_add_history_entry(callable_obj_t *c, GtkTreeIter *parent)
     gchar * description = calltree_display_call_info(c, DISPLAY_TYPE_HISTORY, "");
 
     GtkTreeIter iter;
-    gtk_tree_store_prepend(history_tab->store, &iter, parent);
+    gtk_tree_store_prepend(history_tab->store, &iter, NULL);
 
     GdkPixbuf *pixbuf = NULL;
 
-    if (parent == NULL) {
-        DEBUG("CallTree: This is a first level call not participating in a conference");
     switch (c->_history_state) {
         case INCOMING:
             pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL);
@@ -873,8 +871,6 @@ void calltree_add_history_entry(callable_obj_t *c, GtkTreeIter *parent)
         default:
             WARN("History - Should not happen!");
     }
-    } else // participant to a conference
-        pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/current.svg", NULL);
 
     gchar *date = get_formatted_start_timestamp(c->_time_start);
     gchar *duration = get_call_duration(c);

gnome/src/contacts/calltree.h

@@ -91,7 +91,7 @@ calltree_remove_call(calltab_t *, callable_obj_t *);
  * @param The parent item in case of a conference, should be NULL in case of a normal call
  */
 void
-calltree_add_history_entry (callable_obj_t *, GtkTreeIter *);
+calltree_add_history_entry(callable_obj_t *);
 
 void
 calltree_add_conference_to_current_calls(conference_obj_t *);