Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
0de37b81
Commit
0de37b81
authored
Apr 20, 2010
by
Alexandre Savard
Browse files
[#3247] Remove conference ID in call structure when removing conference
parent
3d4c1e36
Changes
2
Hide whitespace changes
Inline
Side-by-side
sflphone-client-gnome/src/contacts/calltree.c
View file @
0de37b81
...
...
@@ -671,6 +671,8 @@ calltree_remove_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
if
(
selectedCall
==
c
)
calltab_select_call
(
tab
,
NULL
);
update_actions
();
DEBUG
(
"Calltre remove call ended"
);
}
void
...
...
@@ -1300,7 +1302,7 @@ void calltree_remove_conference (calltab_t* tab, const conference_obj_t* conf, G
if
(
tempconf
==
conf
)
{
nbParticipant
=
gtk_tree_model_iter_n_children
(
GTK_TREE_MODEL
(
store
),
&
iter_parent
);
DEBUG
(
"nbParticipant: %i
\n
"
,
nbParticipant
);
DEBUG
(
"nbParticipant: %i"
,
nbParticipant
);
for
(
j
=
0
;
j
<
nbParticipant
;
j
++
)
{
call
=
NULL
;
if
(
gtk_tree_model_iter_nth_child
(
GTK_TREE_MODEL
(
store
),
&
iter_child
,
&
iter_parent
,
j
)){
...
...
sflphone-client-gnome/src/dbus/dbus.c
View file @
0de37b81
...
...
@@ -287,10 +287,25 @@ conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo
static
void
conference_removed_cb
(
DBusGProxy
*
proxy
UNUSED
,
const
gchar
*
confID
,
void
*
foo
UNUSED
)
{
DEBUG
(
"Conference removed %s
\n
"
,
confID
);
DEBUG
(
"
DBUS:
Conference removed %s"
,
confID
);
conference_obj_t
*
c
=
conferencelist_get
(
confID
);
calltree_remove_conference
(
current_calls
,
c
,
NULL
);
GSList
*
participant
=
c
->
participant_list
;
callable_obj_t
*
call
;
while
(
participant
)
{
call
=
calllist_get
(
current_calls
,
(
const
gchar
*
)(
participant
->
data
));
DEBUG
(
"DBUS: Remove participant %s"
,
call
->
_callID
);
if
(
call
->
_confID
){
g_free
(
call
->
_confID
);
call
->
_confID
=
NULL
;
}
participant
=
conference_next_participant
(
participant
);
}
conferencelist_remove
(
c
->
_confID
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment