comparison gui/ui/gtk/fileselect.c @ 35521:baf53d200292

Avoid using local variables named filename. This is the name of a global MPlayer variable. Avoiding it avoids confusion.
author ib
date Wed, 05 Dec 2012 23:28:14 +0000
parents 411875efca3f
children e27855a45128
comparison
equal deleted inserted replaced
35520:ecbaf301748f 35521:baf53d200292
170 } 170 }
171 171
172 static void clist_append_fname(GtkWidget * list, char *fname, 172 static void clist_append_fname(GtkWidget * list, char *fname,
173 GdkPixmap *pixmap, GdkPixmap *mask) { 173 GdkPixmap *pixmap, GdkPixmap *mask) {
174 gint pos; 174 gint pos;
175 gchar *filename, *str[2]; 175 gchar *filename_utf8, *str[2];
176 filename = g_filename_to_utf8(fname, -1, NULL, NULL, NULL); 176 filename_utf8 = g_filename_to_utf8(fname, -1, NULL, NULL, NULL);
177 str[0] = NULL; 177 str[0] = NULL;
178 str[1] = filename ? filename : fname; 178 str[1] = filename_utf8 ? filename_utf8 : fname;
179 pos = gtk_clist_append(GTK_CLIST(list), str); 179 pos = gtk_clist_append(GTK_CLIST(list), str);
180 gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask); 180 gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask);
181 g_free(filename); 181 g_free(filename_utf8);
182 } 182 }
183 183
184 static void CheckDir( GtkWidget * list ) 184 static void CheckDir( GtkWidget * list )
185 { 185 {
186 struct stat fs; 186 struct stat fs;