Merge branch 'master' of git.linphone.org:linphone-private

This commit is contained in:
Simon Morlat 2010-04-15 10:59:41 +02:00
commit fbcae46134
3 changed files with 2 additions and 3 deletions

View file

@ -1024,7 +1024,6 @@ static void linphone_gtk_check_menu_items(void){
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(linphone_gtk_get_widget(
linphone_gtk_get_main_window(),
audio_only ? "audio_only_item" : "video_item")), TRUE);
g_message("Selfview enabled: %i",selfview);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(linphone_gtk_get_widget(
linphone_gtk_get_main_window(),"selfview_item")),selfview);
}

@ -1 +1 @@
Subproject commit b4833d461f63b8c1c2889f379201fb85ba7efd4d
Subproject commit a4d247cb5e8fc2cf04e615d5a7b90251d349b7a8

2
oRTP

@ -1 +1 @@
Subproject commit 0c97230e53c8a8eefde8024ac1f81721ad645992
Subproject commit 6600413b76e49b33976ea4459e5ceffe345655d6