From b2a78cbf970d147e027929ec7d58ea0076f9ea98 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 12 Sep 2016 15:19:37 +0200 Subject: [PATCH] Revert "Experimental feature lime" This reverts commit 837b94df2dc753fe032ced4c87e9f4b1cc8435dc. --- gtk/propertybox.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 3fe2128be..67cd8127a 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -1397,16 +1397,9 @@ static void linphone_gtk_show_media_encryption(GtkWidget *pb){ } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"media_encryption_mandatory_checkbox")), linphone_core_is_media_encryption_mandatory(lc)); - - gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_label"), 0); - gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_combo"), 0); - - if (linphone_gtk_get_ui_config_int("lime_experimental_feature", 0)){ - gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_label"), 1); - gtk_widget_set_visible (linphone_gtk_get_widget(pb,"chat_lime_combo"), 1); - gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"chat_lime_combo")), linphone_core_lime_enabled(lc)); - gtk_widget_set_sensitive(linphone_gtk_get_widget(pb,"chat_lime_combo"), linphone_core_lime_available(lc)); - } + + gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(pb,"chat_lime_combo")), linphone_core_lime_enabled(lc)); + gtk_widget_set_sensitive(linphone_gtk_get_widget(pb,"chat_lime_combo"), linphone_core_lime_available(lc)); g_object_unref(G_OBJECT(model)); }