Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
bdddc771
Commit
bdddc771
authored
13 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #10736: calltree: check if element is conference before treating it as such
parent
5d23323a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
gnome/src/contacts/calltree.c
+131
-127
131 additions, 127 deletions
gnome/src/contacts/calltree.c
with
131 additions
and
127 deletions
gnome/src/contacts/calltree.c
+
131
−
127
View file @
bdddc771
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment