Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
b2e984d5
Commit
b2e984d5
authored
Dec 08, 2011
by
Simon Morlat
Browse files
fix automatic destruction of conference in case there are only 2 people inside.
parent
1615847f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
gtk/conference.c
gtk/conference.c
+5
-3
mediastreamer2
mediastreamer2
+1
-1
No files found.
gtk/conference.c
View file @
b2e984d5
...
...
@@ -49,7 +49,7 @@ static void init_local_participant(GtkWidget *participant){
static
GtkWidget
*
get_conference_tab
(
GtkWidget
*
mw
){
GtkWidget
*
box
=
(
GtkWidget
*
)
g_object_get_data
(
G_OBJECT
(
mw
),
"conference_tab"
);
if
(
box
==
NULL
){
GtkWidget
*
box
=
gtk_vbox_new
(
FALSE
,
0
);
box
=
gtk_vbox_new
(
FALSE
,
0
);
GtkWidget
*
participant
=
linphone_gtk_create_widget
(
"main"
,
"callee_frame"
);
gtk_box_set_homogeneous
(
GTK_BOX
(
box
),
TRUE
);
init_local_participant
(
participant
);
...
...
@@ -124,13 +124,15 @@ void linphone_gtk_terminate_conference_participant(LinphoneCall *call){
void
linphone_gtk_unset_from_conference
(
LinphoneCall
*
call
){
GtkWidget
*
mw
=
linphone_gtk_get_main_window
();
GtkWidget
*
box
=
(
GtkWidget
*
)
g_object_get_data
(
G_OBJECT
(
mw
),
"conference_tab"
);
GtkWidget
*
frame
=
find_conferencee_from_call
(
call
);
GtkWidget
*
frame
;
if
(
box
==
NULL
)
return
;
/*conference tab already destroyed*/
frame
=
find_conferencee_from_call
(
call
);
GList
*
children
;
if
(
frame
){
gtk_widget_destroy
(
frame
);
}
children
=
gtk_container_get_children
(
GTK_CONTAINER
(
box
));
if
(
g_list_length
(
children
)
==
1
){
if
(
g_list_length
(
children
)
==
2
){
/*the conference is terminated */
gtk_widget_destroy
(
box
);
g_object_set_data
(
G_OBJECT
(
mw
),
"conference_tab"
,
NULL
);
...
...
mediastreamer2
@
c00221cb
Subproject commit
a1dc3c6382774035cc66570ad6e659e3c864c493
Subproject commit
c00221cbc2df87f320effb7e82ac1b95a604f6d7
Write
Preview
Markdown
is supported
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