Commit cf65a0f6 authored by Margaux Clerc's avatar Margaux Clerc
Browse files

hold_call disabled in conf

set minimum size to contact list
parent ff0f3964
...@@ -701,9 +701,11 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ ...@@ -701,9 +701,11 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
if (in_conf){ if (in_conf){
linphone_gtk_set_in_conference(call); linphone_gtk_set_in_conference(call);
gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),FALSE); gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),FALSE);
gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"hold_call"),FALSE);
}else{ }else{
linphone_gtk_unset_from_conference(call); /*in case it was previously*/ linphone_gtk_unset_from_conference(call); /*in case it was previously*/
gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),TRUE); gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"incall_mute"),TRUE);
gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"hold_call"),TRUE);
} }
gtk_widget_show_all(linphone_gtk_get_widget(callview,"buttons_panel")); gtk_widget_show_all(linphone_gtk_get_widget(callview,"buttons_panel"));
if (!in_conf) gtk_widget_show_all(linphone_gtk_get_widget(callview,"record_hbox")); if (!in_conf) gtk_widget_show_all(linphone_gtk_get_widget(callview,"record_hbox"));
......
...@@ -1118,7 +1118,7 @@ ...@@ -1118,7 +1118,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkHPaned" id="hpaned1"> <object class="GtkHPaned" id="central_paned">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child> <child>
...@@ -1231,7 +1231,7 @@ ...@@ -1231,7 +1231,7 @@
</object> </object>
<packing> <packing>
<property name="resize">False</property> <property name="resize">False</property>
<property name="shrink">True</property> <property name="shrink">False</property>
</packing> </packing>
</child> </child>
<child> <child>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment