Commit aa465907 authored by Daniel Colascione's avatar Daniel Colascione
Browse files

Code for previous change

parent c4beb8da
......@@ -7337,9 +7337,13 @@ x_bitmap_icon (struct frame *f, Lisp_Object file)
#ifdef USE_GTK
if (xg_set_icon (f, xg_default_icon_file)
|| xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
return 0;
if (FRAME_DISPLAY_INFO (f)->icon_bitmap_id == -2
|| xg_set_icon (f, xg_default_icon_file)
|| xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
{
FRAME_DISPLAY_INFO (f)->icon_bitmap_id = -2;
return 0;
}
#elif defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment