Mercurial > mplayer.hg
comparison gui/ui/gtk/fileselect.c @ 34366:b8a4787f363b
Add /mnt only to the file selector path list if it exists.
Additionally, check for /media and add it if it exists.
author | ib |
---|---|
date | Fri, 23 Dec 2011 13:41:25 +0000 |
parents | b02b6ad1b7fb |
children | b370a9fd85b3 |
comparison
equal
deleted
inserted
replaced
34365:0909b0da0d5b | 34366:b8a4787f363b |
---|---|
250 | 250 |
251 void ShowFileSelect( int type,int modal ) | 251 void ShowFileSelect( int type,int modal ) |
252 { | 252 { |
253 int i, k, fsMedium; | 253 int i, k, fsMedium; |
254 char * tmp = NULL, * dir = NULL; | 254 char * tmp = NULL, * dir = NULL; |
255 struct stat f; | |
255 | 256 |
256 if ( fsFileSelect ) gtkActive( fsFileSelect ); | 257 if ( fsFileSelect ) gtkActive( fsFileSelect ); |
257 else fsFileSelect=create_FileSelect(); | 258 else fsFileSelect=create_FileSelect(); |
258 | 259 |
259 fsType=type; | 260 fsType=type; |
319 | 320 |
320 if ( !tmp && fsMedium ) tmp=guiInfo.Filename; | 321 if ( !tmp && fsMedium ) tmp=guiInfo.Filename; |
321 | 322 |
322 if ( tmp && tmp[0] ) | 323 if ( tmp && tmp[0] ) |
323 { | 324 { |
324 struct stat f; | |
325 dir = strdup( tmp ); | 325 dir = strdup( tmp ); |
326 | 326 |
327 do | 327 do |
328 { | 328 { |
329 char * c = strrchr( dir,'/' ); | 329 char * c = strrchr( dir,'/' ); |
353 } | 353 } |
354 } | 354 } |
355 free( dir ); | 355 free( dir ); |
356 if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) ); | 356 if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) ); |
357 fsTopList_items=g_list_append( fsTopList_items,"/home" ); | 357 fsTopList_items=g_list_append( fsTopList_items,"/home" ); |
358 fsTopList_items=g_list_append( fsTopList_items,"/mnt" ); | 358 if (stat( "/mnt",&f ) == 0) fsTopList_items=g_list_append( fsTopList_items,"/mnt" ); |
359 if (stat( "/media",&f ) == 0) fsTopList_items=g_list_append( fsTopList_items,"/media" ); | |
359 fsTopList_items=g_list_append( fsTopList_items,"/" ); | 360 fsTopList_items=g_list_append( fsTopList_items,"/" ); |
360 gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items ); | 361 gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items ); |
361 | 362 |
362 gtk_widget_grab_focus( fsFNameList ); | 363 gtk_widget_grab_focus( fsFNameList ); |
363 ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected; | 364 ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected; |