Mercurial > mplayer.hg

comparison gui/dialog/fileselect.c @ 35971:cb1b178d3670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename fs_glist_add() fs_AddPath().
author ib
date Thu, 28 Mar 2013 15:33:37 +0000
parents 90b6cc0747fb
children 3ccb13092e88
comparison
equal deleted inserted replaced
35970:90b6cc0747fb 35971:cb1b178d3670
252 252
253 gtk_clist_set_column_width( GTK_CLIST( list ),0,17 ); 253 gtk_clist_set_column_width( GTK_CLIST( list ),0,17 );
254 gtk_widget_show( list ); 254 gtk_widget_show( list );
255 } 255 }
256 256
257 static GList *fs_glist_add (GList *list, gpointer data, GtkPositionType pos) 257 static GList *fs_AddPath (GList *list, gpointer data, GtkPositionType pos)
258 { 258 {
259 if (!g_list_find_custom(list, data, (GCompareFunc) strcmp)) 259 if (!g_list_find_custom(list, data, (GCompareFunc) strcmp))
260 { 260 {
261 if (pos == GTK_POS_TOP) list = g_list_prepend(list, data); 261 if (pos == GTK_POS_TOP) list = g_list_prepend(list, data);
262 else list = g_list_append(list, data); 262 else list = g_list_append(list, data);
268 static void fs_AddPathUtf8 (const char *name, GtkPositionType pos) 268 static void fs_AddPathUtf8 (const char *name, GtkPositionType pos)
269 { 269 {
270 gchar *utf8name; 270 gchar *utf8name;
271 271
272 utf8name = g_filename_display_name(name); 272 utf8name = g_filename_display_name(name);
273 fsTopList_items = fs_glist_add(fsTopList_items, utf8name, pos); 273 fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos);
274 g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); 274 g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name));
275 } 275 }
276 276
277 static void HideFileSelect( void ) 277 static void HideFileSelect( void )
278 { 278 {
755 if ( c && dir ) fs_AddPathUtf8(dir, GTK_POS_TOP); 755 if ( c && dir ) fs_AddPathUtf8(dir, GTK_POS_TOP);
756 } 756 }
757 free( dir ); 757 free( dir );
758 fname = getenv( "HOME" ); 758 fname = getenv( "HOME" );
759 if ( fname ) fs_AddPathUtf8(fname, GTK_POS_BOTTOM); 759 if ( fname ) fs_AddPathUtf8(fname, GTK_POS_BOTTOM);
760 else fsTopList_items=fs_glist_add( fsTopList_items,g_strdup( "/home" ),GTK_POS_BOTTOM ); 760 else fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/home" ),GTK_POS_BOTTOM );
761 if (stat( "/media",&f ) == 0) fsTopList_items=fs_glist_add( fsTopList_items,g_strdup( "/media" ),GTK_POS_BOTTOM ); 761 if (stat( "/media",&f ) == 0) fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/media" ),GTK_POS_BOTTOM );
762 if (stat( "/mnt",&f ) == 0) fsTopList_items=fs_glist_add( fsTopList_items,g_strdup( "/mnt" ),GTK_POS_BOTTOM ); 762 if (stat( "/mnt",&f ) == 0) fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/mnt" ),GTK_POS_BOTTOM );
763 fsTopList_items=fs_glist_add( fsTopList_items,g_strdup( "/" ),GTK_POS_BOTTOM ); 763 fsTopList_items=fs_AddPath( fsTopList_items,g_strdup( "/" ),GTK_POS_BOTTOM );
764 gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items ); 764 gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items );
765 765
766 gtk_widget_grab_focus( fsFNameList ); 766 gtk_widget_grab_focus( fsFNameList );
767 if (fsLastFNameListSelected + 1 > ((GtkCList *)fsFNameList)->rows) fsLastFNameListSelected = 0; 767 if (fsLastFNameListSelected + 1 > ((GtkCList *)fsFNameList)->rows) fsLastFNameListSelected = 0;
768 ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected; 768 ((GtkCList *)fsFNameList)->focus_row = fsLastFNameListSelected;