# HG changeset patch # User ib # Date 1364489576 0 # Node ID 6eaf7941b762b90c8f73a09ff04025f28d4c779d # Parent 16f60d1a3b7fcf8366ee82b2089c3f974386125f Rename ShowFileSelect() ShowFileSelector(). Additionally, remove a parameter. It's always the same, default value anyway. diff -r 16f60d1a3b7f -r 6eaf7941b762 gui/dialog/dialog.c --- a/gui/dialog/dialog.c Thu Mar 28 16:35:59 2013 +0000 +++ b/gui/dialog/dialog.c Thu Mar 28 16:52:56 2013 +0000 @@ -325,17 +325,17 @@ break; case evLoad: - ShowFileSelect(FILESELECT_VIDEO_AUDIO, 0); + ShowFileSelector(FILESELECT_VIDEO_AUDIO); gtkSetLayer(FileSelector); break; case evLoadSubtitle: - ShowFileSelect(FILESELECT_SUBTITLE, 0); + ShowFileSelector(FILESELECT_SUBTITLE); gtkSetLayer(FileSelector); break; case evLoadAudioFile: - ShowFileSelect(FILESELECT_AUDIO, 0); + ShowFileSelector(FILESELECT_AUDIO); gtkSetLayer(FileSelector); break; diff -r 16f60d1a3b7f -r 6eaf7941b762 gui/dialog/fileselect.c --- a/gui/dialog/fileselect.c Thu Mar 28 16:35:59 2013 +0000 +++ b/gui/dialog/fileselect.c Thu Mar 28 16:52:56 2013 +0000 @@ -652,7 +652,7 @@ return FileSelector; } -void ShowFileSelect( int type,int modal ) +void ShowFileSelector( int type ) { int i, k, fsMedium; char * tmp = NULL, * dir = NULL; @@ -769,7 +769,5 @@ gtk_clist_select_row( GTK_CLIST( fsFNameList ),fsLastFNameListSelected,1 ); fsLastFNameListSelected = 0; - gtk_window_set_modal( GTK_WINDOW( FileSelector ),modal ); - gtk_widget_show( FileSelector ); } diff -r 16f60d1a3b7f -r 6eaf7941b762 gui/dialog/fileselect.h --- a/gui/dialog/fileselect.h Thu Mar 28 16:35:59 2013 +0000 +++ b/gui/dialog/fileselect.h Thu Mar 28 16:52:56 2013 +0000 @@ -31,6 +31,6 @@ extern GtkWidget *FileSelector; -void ShowFileSelect(int type, int modal); +void ShowFileSelector(int type); #endif /* MPLAYER_GUI_FILESELECT_H */ diff -r 16f60d1a3b7f -r 6eaf7941b762 gui/dialog/preferences.c --- a/gui/dialog/preferences.c Thu Mar 28 16:35:59 2013 +0000 +++ b/gui/dialog/preferences.c Thu Mar 28 16:52:56 2013 +0000 @@ -657,7 +657,7 @@ break; #endif case bLFont: - ShowFileSelect( FILESELECT_FONT,FALSE ); + ShowFileSelector( FILESELECT_FONT ); gtkSetLayer( FileSelector ); break; }