[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk sb.c,1.16,1.17

Zoltan Ponekker pontscho at mplayerhq.hu
Sat Jan 18 01:22:26 CET 2003


Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv29353

Modified Files:
	sb.c 
Log Message:
10l found by Arpi (njamd)

Index: sb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sb.c	2 Jan 2003 15:48:29 -0000	1.16
+++ sb.c	18 Jan 2003 00:22:18 -0000	1.17
@@ -50,15 +50,10 @@
 
  gtkOldSkin=strdup( skinName );
  prev=gtkOldSkin;
- if ( ( str[0]=(char *)calloc( 1,7 ) ) == NULL )
-  {
-   gtkMessageBox( GTK_MB_FATAL,MSGTR_SKINBROWSER_NotEnoughMemory );
-   return 0;
-  }
+
+ str[0]="default";
  str[1]="";
- strcpy( str[0],"default" );
  if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str );
- free( str[0] );
 
  glob( mdir,GLOB_NOSORT,NULL,&gg );
  for( i=0;i<(int)gg.gl_pathc;i++ )
@@ -69,10 +64,8 @@
     {
      tmp=strrchr( gg.gl_pathv[i],'/' ); tmp++;
      if ( !strcmp( tmp,"default" ) ) continue;
-     if ( ( str[0]=(char *)malloc( strlen( tmp ) + 1 ) ) == NULL ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_SKINBROWSER_NotEnoughMemory ); return 0; }
-     strcpy( str[0],tmp );
+     str[0]=tmp;
      if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str );
-     free( str[0] );
     }
   }
  globfree( &gg );



More information about the MPlayer-cvslog mailing list