Update ms2

[linphone] / gtk / incall_view.c

diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index 4ab0bd72e8e4f49fe18827b0d1246c0a019b29ca..5e13f2602e340d9c90eaedad7990e206438cbe14 100644 (file)
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -75,7 +75,7 @@ static GtkWidget *make_tab_header(int number){
        return w;
 }
 
-void update_tab_header(LinphoneCall *call,gboolean pause){
+void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){
        GtkWidget *w=(GtkWidget*)linphone_call_get_user_pointer(call);
        GtkWidget *main_window=linphone_gtk_get_main_window();
        GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(main_window,"viewswitch"));
@@ -688,7 +688,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
 
        gtk_label_set_text(GTK_LABEL(duration),_("00::00::00"));
        linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_MEDIA_PLAY,TRUE);
-               update_tab_header(call,FALSE);
+       linphone_gtk_call_update_tab_header(call,FALSE);
        linphone_gtk_enable_mute_button(
                                        GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),TRUE);
        
@@ -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"));
@@ -758,10 +760,11 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
        gtk_widget_hide(linphone_gtk_get_widget(callview,"record_hbox"));
        gtk_widget_hide(linphone_gtk_get_widget(callview,"buttons_panel"));
        gtk_widget_hide(linphone_gtk_get_widget(callview,"incall_audioview"));
+       gtk_widget_hide(linphone_gtk_get_widget(callview,"quality_indicator"));
        linphone_gtk_enable_mute_button(
                GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),FALSE);
        linphone_gtk_enable_hold_button(call,FALSE,TRUE);
-
+       
        if (taskid!=0) g_source_remove(taskid);
        g_timeout_add_seconds(2,(GSourceFunc)in_call_view_terminated,call);
        if (in_conf)
@@ -843,7 +846,7 @@ void linphone_gtk_draw_hold_button(GtkButton *button, gboolean active){
 void linphone_gtk_hold_clicked(GtkButton *button){
        int active=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"active"));
        LinphoneCall *call=linphone_gtk_get_currently_displayed_call(NULL);
-       update_tab_header(call,active);
+       linphone_gtk_call_update_tab_header(call,active);
        if (!call) return;
        if(!active)
        {
@@ -859,7 +862,7 @@ void linphone_gtk_enable_hold_button(LinphoneCall *call, gboolean sensitive, gbo
        GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer (call);
        GtkWidget *button;
        g_return_if_fail(callview!=NULL);
-       update_tab_header(call,!holdon);
+       linphone_gtk_call_update_tab_header(call,!holdon);
        button=linphone_gtk_get_widget(callview,"hold_call");
        gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive);
        gtk_widget_set_visible(GTK_WIDGET(button),sensitive);