Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

This commit is contained in:
Simon Morlat 2011-04-04 15:26:56 +02:00
commit 300b0e6727
2 changed files with 4 additions and 2 deletions

View file

@ -239,7 +239,9 @@ fi
if test "$relativeprefix" = "auto" ; then
case $target_os in
*darwin*)
relativeprefix=yes
if test "$enable_x11" = "false" ; then
relativeprefix=yes
fi
;;
*mingw*)
relativeprefix=yes

View file

@ -1266,7 +1266,7 @@ gboolean linphone_gtk_close(GtkWidget *mw){
linphone_core_terminate_all_calls(lc);
}
linphone_core_enable_video_preview(lc,FALSE);
#ifdef HAVE_GTK_OSX
#ifdef __APPLE__ /*until with have a better option*/
gtk_window_iconify(GTK_WINDOW(mw));
#else
gtk_widget_hide(mw);