g_strdown() modifies the filename, so use strcasecmp() for the comparison
2004-10-05 James Henstridge <james@jamesh.id.au> * src/util.c (zenity_util_pixbuf_new_from_file): g_strdown() modifies the filename, so use strcasecmp() for the comparison instead. Since we are comparing against fixed ASCII strings, this should have no UTF-8 issues.
This commit is contained in:
parent
c925587f69
commit
45943a3b43
@ -146,13 +146,13 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename)
|
|||||||
GdkPixbuf *
|
GdkPixbuf *
|
||||||
zenity_util_pixbuf_new_from_file (GtkWidget *widget, gchar *filename)
|
zenity_util_pixbuf_new_from_file (GtkWidget *widget, gchar *filename)
|
||||||
{
|
{
|
||||||
if (!strcmp (g_strdown (filename), "warning"))
|
if (!strcasecmp (filename, "warning"))
|
||||||
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON, NULL);
|
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON, NULL);
|
||||||
if (!strcmp (g_strdown (filename), "info"))
|
if (!strcasecmp (filename, "info"))
|
||||||
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON, NULL);
|
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON, NULL);
|
||||||
if (!strcmp (g_strdown (filename), "question"))
|
if (!strcasecmp (filename, "question"))
|
||||||
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_BUTTON, NULL);
|
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_BUTTON, NULL);
|
||||||
if (!strcmp (g_strdown (filename), "error"))
|
if (!strcasecmp (filename, "error"))
|
||||||
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_BUTTON, NULL);
|
return gtk_widget_render_icon (widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_BUTTON, NULL);
|
||||||
else
|
else
|
||||||
return gdk_pixbuf_new_from_file (filename, NULL);
|
return gdk_pixbuf_new_from_file (filename, NULL);
|
||||||
|
Reference in New Issue
Block a user