From 70f74b60f9406d6fe43434b601ee7284935c3ef0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 27 Oct 2015 15:54:22 +0100 Subject: [PATCH] Fix bug 0002609: Encryption lock icon too small. --- gtk/in_call_frame.ui | 88 +++++++++++++++++++++++++++----------------- gtk/incall_view.c | 62 +++++++++++++++++-------------- 2 files changed, 88 insertions(+), 62 deletions(-) diff --git a/gtk/in_call_frame.ui b/gtk/in_call_frame.ui index f58ed61d9..a263688d7 100644 --- a/gtk/in_call_frame.ui +++ b/gtk/in_call_frame.ui @@ -2,6 +2,11 @@ + + True + False + linphone-security-pending + False cursor @@ -44,53 +49,68 @@ - + False - - True - False - linphone-security-pending - - - False - False - 0 - - - - - True - False - - - True - True - 2 - 1 - - - - - Set verified + True True True + zrtp_button_icon + none - False + True False - 2 + 0 False - True + False 2 + + + False + 4 + + + True + False + 1 + 16 + linphone-security-ok + + + True + True + 0 + + + + + True + False + 0 + Encryption status + + + True + True + 1 + + + + + True + True + 3 + + True @@ -185,7 +205,7 @@ False False 5 - 3 + 4 @@ -224,7 +244,7 @@ False False - 4 + 5 @@ -262,7 +282,7 @@ False False - 5 + 6 @@ -352,7 +372,7 @@ False False 7 - 6 + 7 diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 31d11d646..2854c1310 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -715,47 +715,53 @@ void linphone_gtk_auth_token_verified_clicked(GtkButton *button){ } void linphone_gtk_in_call_view_show_encryption(LinphoneCall *call){ - GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call); - GtkWidget *encryption_box=linphone_gtk_get_widget(callview,"encryption_box"); - GtkWidget *label=linphone_gtk_get_widget(callview,"encryption_label"); - GtkWidget *status_icon=linphone_gtk_get_widget(callview,"encryption_status_icon"); - GtkWidget *verify_button=linphone_gtk_get_widget(callview,"encryption_verify_button"); - LinphoneMediaEncryption me=linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)); - bool_t verified=linphone_call_get_authentication_token_verified(call); - switch(me){ + GtkWidget *callview = (GtkWidget*)linphone_call_get_user_pointer(call); + GtkWidget *encryption_status_box = linphone_gtk_get_widget(callview, "encryption_status_box"); + GtkWidget *encryption_status_label = linphone_gtk_get_widget(callview, "encryption_status_label"); + GtkWidget *encryption_status_icon = linphone_gtk_get_widget(callview, "encryption_status_icon"); + GtkWidget *zrtp_box = linphone_gtk_get_widget(callview, "zrtp_box"); + GtkWidget *zrtp_button = linphone_gtk_get_widget(callview, "zrtp_button"); + GtkWidget *zrtp_status_icon = gtk_button_get_image(GTK_BUTTON(zrtp_button)); + LinphoneMediaEncryption me = linphone_call_params_get_media_encryption(linphone_call_get_current_params(call)); + + switch (me) { case LinphoneMediaEncryptionSRTP: - gtk_widget_show_all(encryption_box); - gtk_label_set_markup(GTK_LABEL(label),_("Secured by SRTP")); - gtk_image_set_from_icon_name(GTK_IMAGE(status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU); - gtk_widget_hide(verify_button); - break; + gtk_widget_hide_all(zrtp_box); + gtk_widget_show_all(encryption_status_box); + gtk_label_set_markup(GTK_LABEL(encryption_status_label), _("Secured by SRTP")); + gtk_image_set_from_icon_name(GTK_IMAGE(encryption_status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU); + break; case LinphoneMediaEncryptionDTLS: - gtk_widget_show_all(encryption_box); - gtk_label_set_markup(GTK_LABEL(label),_("Secured by DTLS")); - gtk_image_set_from_icon_name(GTK_IMAGE(status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU); - gtk_widget_hide(verify_button); - break; + gtk_widget_hide_all(zrtp_box); + gtk_widget_show_all(encryption_status_box); + gtk_label_set_markup(GTK_LABEL(encryption_status_label), _("Secured by DTLS")); + gtk_image_set_from_icon_name(GTK_IMAGE(encryption_status_icon), "linphone-security-ok", GTK_ICON_SIZE_MENU); + break; case LinphoneMediaEncryptionZRTP: { - gchar *text=g_strdup_printf(_("Secured by ZRTP - [auth token: %s]"),linphone_call_get_authentication_token(call)); - gtk_label_set_markup(GTK_LABEL(label),text); + bool_t verified = linphone_call_get_authentication_token_verified(call); + gchar *text = g_strdup_printf(_("Secured by ZRTP - [auth token: %s]"), linphone_call_get_authentication_token(call)); + gtk_button_set_label(GTK_BUTTON(zrtp_button), text); g_free(text); - gtk_image_set_from_icon_name(GTK_IMAGE(status_icon), - verified ? "linphone-security-ok" : "linphone-security-pending", GTK_ICON_SIZE_MENU); - gtk_button_set_label(GTK_BUTTON(verify_button), - verified ? _("Set unverified") : _("Set verified")); - gtk_widget_show_all(encryption_box); + gtk_image_set_from_icon_name(GTK_IMAGE(zrtp_status_icon), verified ? "linphone-security-ok" : "linphone-security-pending", GTK_ICON_SIZE_MENU); + gtk_widget_set_tooltip_text(zrtp_button, verified ? _("Set unverified") : _("Set verified")); + gtk_widget_hide_all(encryption_status_box); + gtk_widget_show_all(zrtp_box); } break; default: - gtk_widget_hide_all(encryption_box); + gtk_widget_hide_all(encryption_status_box); + gtk_widget_hide_all(zrtp_box); + break; } } void linphone_gtk_in_call_view_hide_encryption(LinphoneCall *call) { GtkWidget *callview = (GtkWidget*)linphone_call_get_user_pointer(call); - GtkWidget *encryption_box = linphone_gtk_get_widget(callview, "encryption_box"); - gtk_widget_hide_all(encryption_box); + GtkWidget *encryption_status_box = linphone_gtk_get_widget(callview, "encryption_status_box"); + GtkWidget *zrtp_box = linphone_gtk_get_widget(callview, "zrtp_box"); + gtk_widget_hide_all(encryption_status_box); + gtk_widget_hide_all(zrtp_box); } char *linphone_gtk_address(const LinphoneAddress *addr){