[MPlayer-cvslog] r36097 - trunk/gui/dialog/preferences.c

[Ivan Kalvachev]

On 3/29/13, ib <subversion at mplayerhq.hu> wrote:
> Author: ib
> Date: Fri Mar 29 18:28:44 2013
> New Revision: 36097
>
> Log:
> Remove HidePreferences(), HideAudioConfig() and HideDXR3Config().
>
> Simply destroy the windows.
>
> (It's pointless to check whether the window is existing,
> because it cannot be called without an existing window.)
>
> In order to do so, relocate definition of AudioConfig.
>
> Additionally, remove unnecessary declarations.
>
> Modified:
>    trunk/gui/dialog/preferences.c
>
> Modified: trunk/gui/dialog/preferences.c
> ==============================================================================
> --- trunk/gui/dialog/preferences.c	Fri Mar 29 18:23:47 2013	(r36096)
> +++ trunk/gui/dialog/preferences.c	Fri Mar 29 18:28:44 2013	(r36097)
[...]
> @@ -352,7 +340,20 @@ static void prButton( GtkButton * button
>  	setdup( &cdrom_device,gtk_entry_get_text( GTK_ENTRY( prECDRomDevice ) )
> );
>
>     case bCancel:
> -	HidePreferences();
> +	gtk_widget_destroy( Preferences );
> +	Preferences=NULL;
> +	if ( AudioConfig )
> +	{
> +	 gtk_widget_destroy( AudioConfig );
> +	 AudioConfig=NULL;
> +	}
> +#ifdef CONFIG_DXR3
> +	if ( DXR3Config )
> +	{
> +	 gtk_widget_destroy( DXR3Config );
> +	 DXR3Config=NULL;
> +	}
> +#endif

There is a small problem here: "DXR3Config" is defined a thousands lines bellow.

A user complained by build failure in recent svn :
"gui/dialog/preferences.c:351:7: error: 'DXR3Config' undeclared (first
use in this function)"
after having em8300-devel-0.18.0 installed for some reason (fedora).