hold_call disabled in conf

set minimum size to contact list

diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 01e3b3cd99d010a12ea2168ef18c05880b186900..5e13f2602e340d9c90eaedad7990e206438cbe14 100644 (file)
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -701,9 +701,11 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
        if (in_conf){
                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,"hold_call"),FALSE);
        }else{
                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,"hold_call"),TRUE);
        }
        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"));

diff --git a/gtk/main.ui b/gtk/main.ui
index 591b042ae04f509ce3eb8e9dca341bbd80d577e9..dde462ec34396e050df8ab5233e6c081150615d4 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -1118,7 +1118,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHPaned" id="hpaned1">
+                  <object class="GtkHPaned" id="central_paned">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
@@ -1231,7 +1231,7 @@
                       </object>
                       <packing>
                         <property name="resize">False</property>
-                        <property name="shrink">True</property>
+                        <property name="shrink">False</property>
                       </packing>
                     </child>
                     <child>