(x_set_name_internal): Set icon to `text', derived from name, when

frame's icon_name isn't a string rather than only when it is nil.

src/ChangeLog

+2006-06-02  John Paul Wallington  <jpw@gnu.org>
+
+	* xfns.c (x_set_name_internal): Set icon to `text', derived from
+	name, when frame's icon_name isn't a string rather than only when
+	it is nil.
+
 2006-06-03  Eli Zaretskii  <eliz@gnu.org>
 	* w32fns.c (x_set_icon_name): Don't use arg if it's not a string

src/xfns.c

@@ -1626,7 +1626,7 @@ x_set_name_internal (f, name)
 	text.format = 8;
 	text.nitems = bytes;
 
-	if (NILP (f->icon_name))
+	if (!STRINGP (f->icon_name))
 	  {
 	    icon = text;
 	  }