diff 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
line wrap: on
line diff
--- a/gui/ui/gtk/fileselect.c	Wed Dec 05 23:12:53 2012 +0000
+++ b/gui/ui/gtk/fileselect.c	Wed Dec 05 23:28:14 2012 +0000
@@ -172,13 +172,13 @@
 static void clist_append_fname(GtkWidget * list, char *fname,
                                GdkPixmap *pixmap, GdkPixmap *mask) {
   gint pos;
-  gchar *filename, *str[2];
-  filename = g_filename_to_utf8(fname, -1, NULL, NULL, NULL);
+  gchar *filename_utf8, *str[2];
+  filename_utf8 = g_filename_to_utf8(fname, -1, NULL, NULL, NULL);
   str[0] = NULL;
-  str[1] = filename ? filename : fname;
+  str[1] = filename_utf8 ? filename_utf8 : fname;
   pos = gtk_clist_append(GTK_CLIST(list), str);
   gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask);
-  g_free(filename);
+  g_free(filename_utf8);
 }
 
 static void CheckDir( GtkWidget * list )