Skip to content

GitLab

Commit 6abcf188 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix for mac, to make radio buttons of option menu consistent

parent 03ddd98b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
coreapi/linphonecore.c
View file @ 6abcf188
......@@ -752,7 +752,6 @@ static void codecs_config_read(LinphoneCore *lc)
static void video_config_read(LinphoneCore *lc){
int capture, display, self_view;
int enabled;
const char *str;
int ndev;
const char **devices;
......@@ -776,10 +775,9 @@ static void video_config_read(LinphoneCore *lc){
linphone_core_set_preferred_video_size_by_name(lc,
lp_config_get_string(lc->config,"video","size","cif"));
enabled=lp_config_get_int(lc->config,"video","enabled",1);
capture=lp_config_get_int(lc->config,"video","capture",enabled);
display=lp_config_get_int(lc->config,"video","display",enabled);
self_view=lp_config_get_int(lc->config,"video","self_view",enabled);
capture=lp_config_get_int(lc->config,"video","capture",1);
display=lp_config_get_int(lc->config,"video","display",1);
self_view=lp_config_get_int(lc->config,"video","self_view",1);
lc->video_conf.displaytype=lp_config_get_string(lc->config,"video","displaytype",NULL);
if(lc->video_conf.displaytype)
ms_message("we are using a specific display:%s\n",lc->video_conf.displaytype);
......@@ -3807,7 +3805,6 @@ void sound_config_uninit(LinphoneCore *lc)
void video_config_uninit(LinphoneCore *lc)
{
lp_config_set_int(lc->config,"video","enabled",linphone_core_video_enabled(lc));
lp_config_set_string(lc->config,"video","size",video_size_get_name(linphone_core_get_preferred_video_size(lc)));
lp_config_set_int(lc->config,"video","display",lc->video_conf.display);
lp_config_set_int(lc->config,"video","capture",lc->video_conf.capture);
......
gtk/main.c
View file @ 6abcf188
......@@ -1293,7 +1293,6 @@ static void linphone_gtk_init_main_window(){
linphone_gtk_set_my_presence(linphone_core_get_presence_info(linphone_gtk_get_core()));
linphone_gtk_show_friends();
linphone_gtk_connect_digits();
linphone_gtk_check_menu_items();
main_window=linphone_gtk_get_main_window();
linphone_gtk_enable_mute_button(GTK_BUTTON(linphone_gtk_get_widget(main_window,
"main_mute")),FALSE);
......@@ -1314,6 +1313,7 @@ static void linphone_gtk_init_main_window(){
gtk_osxapplication_ready(theMacApp);
}
#endif
linphone_gtk_check_menu_items();
}
......
mediastreamer2 @ 88d2500c
Subproject commit cd270c165f205954bd16ca76d0be2dff8f92cbd5
Subproject commit 88d2500c0a1a01c136f0e7ebb8d9872262b57a41
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