Mercurial > mplayer.hg

comparison gui/mplayer/gtk/fs.c @ 32721:77ef1bcd464f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove needless get_current_dir_name() calls and unused parameter of CheckDir().
author ib
date Fri, 21 Jan 2011 15:20:00 +0000
parents 29b63f338a9b
children 25a3c1b7d090
comparison
equal deleted inserted replaced
32720:1afbc8e3ff55 32721:77ef1bcd464f
188 pos = gtk_clist_append(GTK_CLIST(list), str); 188 pos = gtk_clist_append(GTK_CLIST(list), str);
189 gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask); 189 gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask);
190 g_free(filename); 190 g_free(filename);
191 } 191 }
192 192
193 static void CheckDir( GtkWidget * list,char * directory ) 193 static void CheckDir( GtkWidget * list )
194 { 194 {
195 struct stat fs; 195 struct stat fs;
196 int i; 196 int i;
197 glob_t gg; 197 glob_t gg;
198 198
377 377
378 static void fs_fsFilterCombo_activate( GtkEditable * editable, 378 static void fs_fsFilterCombo_activate( GtkEditable * editable,
379 gpointer user_data ) 379 gpointer user_data )
380 { 380 {
381 fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) ); 381 fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) );
382 CheckDir( fsFNameList,get_current_dir_name() ); 382 CheckDir( fsFNameList );
383 } 383 }
384 384
385 static void fs_fsFilterCombo_changed( GtkEditable * editable, 385 static void fs_fsFilterCombo_changed( GtkEditable * editable,
386 gpointer user_data ) 386 gpointer user_data )
387 { 387 {
417 if( !strcmp( str,fsFontFileNames[i][0] ) ) 417 if( !strcmp( str,fsFontFileNames[i][0] ) )
418 { fsFilter=fsFontFileNames[i][1]; fsLastFontFilterSelected = i; break; } 418 { fsFilter=fsFontFileNames[i][1]; fsLastFontFilterSelected = i; break; }
419 break; 419 break;
420 default: return; 420 default: return;
421 } 421 }
422 CheckDir( fsFNameList,get_current_dir_name() ); 422 CheckDir( fsFNameList );
423 } 423 }
424 424
425 static void fs_fsPathCombo_activate( GtkEditable * editable, 425 static void fs_fsPathCombo_activate( GtkEditable * editable,
426 gpointer user_data ) 426 gpointer user_data )
427 { 427 {
428 const unsigned char * str; 428 const unsigned char * str;
429 gchar * dirname; 429 gchar * dirname;
430 430
431 str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); 431 str=gtk_entry_get_text( GTK_ENTRY( user_data ) );
432 dirname = g_filename_from_utf8( str, -1, NULL, NULL, NULL ); 432 dirname = g_filename_from_utf8( str, -1, NULL, NULL, NULL );
433 if ( chdir( dirname ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() ); 433 if ( chdir( dirname ) != -1 ) CheckDir( fsFNameList );
434 g_free( dirname ); 434 g_free( dirname );
435 } 435 }
436 436
437 static void fs_fsPathCombo_changed( GtkEditable * editable, 437 static void fs_fsPathCombo_changed( GtkEditable * editable,
438 gpointer user_data ) 438 gpointer user_data )
440 const unsigned char * str; 440 const unsigned char * str;
441 gchar * dirname; 441 gchar * dirname;
442 442
443 str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); 443 str=gtk_entry_get_text( GTK_ENTRY( user_data ) );
444 dirname = g_filename_from_utf8( str, -1, NULL, NULL, NULL ); 444 dirname = g_filename_from_utf8( str, -1, NULL, NULL, NULL );
445 if ( chdir( dirname ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() ); 445 if ( chdir( dirname ) != -1 ) CheckDir( fsFNameList );
446 g_free( dirname ); 446 g_free( dirname );
447 } 447 }
448 448
449 static void fs_Up_released( GtkButton * button, gpointer user_data ) 449 static void fs_Up_released( GtkButton * button, gpointer user_data )
450 { 450 {
451 chdir( ".." ); 451 chdir( ".." );
452 fsSelectedFile=fsThatDir; 452 fsSelectedFile=fsThatDir;
453 CheckDir( fsFNameList,get_current_dir_name() ); 453 CheckDir( fsFNameList );
454 gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name_utf8() ); 454 gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name_utf8() );
455 return; 455 return;
456 } 456 }
457 457
458 static void fs_Ok_released( GtkButton * button, gpointer user_data ) 458 static void fs_Ok_released( GtkButton * button, gpointer user_data )
464 stat( fsSelectedFile,&fs ); 464 stat( fsSelectedFile,&fs );
465 if( S_ISDIR(fs.st_mode ) ) 465 if( S_ISDIR(fs.st_mode ) )
466 { 466 {
467 chdir( fsSelectedFile ); 467 chdir( fsSelectedFile );
468 fsSelectedFile=fsThatDir; 468 fsSelectedFile=fsThatDir;
469 CheckDir( fsFNameList,get_current_dir_name() ); 469 CheckDir( fsFNameList );
470 gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name_utf8() ); 470 gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name_utf8() );
471 return; 471 return;
472 } 472 }
473 473
474 fsSelectedDirectory=(unsigned char *)get_current_dir_name(); 474 fsSelectedDirectory=(unsigned char *)get_current_dir_name();