comparison gui/ui/gtk/fileselect.c @ 33739:9f6d46d325de

Remove gfree() from interface.c. Rename it nfree() and define it as macro.

33738:998f94e62a61

#include "gui/ui/pixmaps/dir.xpm"
#include "gui/ui/pixmaps/file.xpm"

#include "gui/app.h"
#include "gui/interface.h"
#include "gui/util/string.h"
#include "help_mp.h"
#include "mpcommon.h"
#include "stream/stream.h"

  if ( fsHistory[i] && !strcmp( fsHistory[i],subject ) )
   {
    char * tmp = fsHistory[i]; fsHistory[i]=fsHistory[0]; fsHistory[0]=tmp;
    return;
   }
 gfree( (void **)&fsHistory[fsPersistant_MaxPos - 1] );
 for ( i=fsPersistant_MaxPos - 1;i;i-- ) fsHistory[i]=fsHistory[i - 1];
 fsHistory[0]=gstrdup( subject );
}
//-----------------------------------------------

  {
   case fsVideoSelector:
          guiSetDF( guiInfo.Filename,fsSelectedDirectory,fsSelectedFile );
          guiInfo.StreamType=STREAMTYPE_FILE;
          guiInfo.FilenameChanged=1; sub_fps=0;
	  gfree( (void **)&guiInfo.AudioFile );
	  gfree( (void **)&guiInfo.Subtitlename );
          fs_PersistantHistory( get_current_dir_name_utf8() );      //totem, write into history
          break;
   case fsSubtitleSelector:
          guiSetDF( guiInfo.Subtitlename,fsSelectedDirectory,fsSelectedFile );
	  guiLoadSubtitle( guiInfo.Subtitlename );

33739:9f6d46d325de

#include "gui/ui/pixmaps/dir.xpm"
#include "gui/ui/pixmaps/file.xpm"

#include "gui/app.h"
#include "gui/interface.h"
#include "gui/util/mem.h"
#include "gui/util/string.h"
#include "help_mp.h"
#include "mpcommon.h"
#include "stream/stream.h"

  if ( fsHistory[i] && !strcmp( fsHistory[i],subject ) )
   {
    char * tmp = fsHistory[i]; fsHistory[i]=fsHistory[0]; fsHistory[0]=tmp;
    return;
   }
 nfree( fsHistory[fsPersistant_MaxPos - 1] );
 for ( i=fsPersistant_MaxPos - 1;i;i-- ) fsHistory[i]=fsHistory[i - 1];
 fsHistory[0]=gstrdup( subject );
}
//-----------------------------------------------

  {
   case fsVideoSelector:
          guiSetDF( guiInfo.Filename,fsSelectedDirectory,fsSelectedFile );
          guiInfo.StreamType=STREAMTYPE_FILE;
          guiInfo.FilenameChanged=1; sub_fps=0;
	  nfree( guiInfo.AudioFile );
	  nfree( guiInfo.Subtitlename );
          fs_PersistantHistory( get_current_dir_name_utf8() );      //totem, write into history
          break;
   case fsSubtitleSelector:
          guiSetDF( guiInfo.Subtitlename,fsSelectedDirectory,fsSelectedFile );
	  guiLoadSubtitle( guiInfo.Subtitlename );