From: John Paul Wallington <jpw@pobox.com>
Date: Fri, 2 Jun 2006 21:35:39 +0000 (+0000)
Subject: (x_set_name_internal): Set icon to `text', derived from name, when
X-Git-Tag: emacs-pretest-22.0.90~2109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4985dde2d0220cf74334261e0f558c377d295815;p=emacs.git

(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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b352232cb2..27040e76822 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/src/xfns.c b/src/xfns.c
index 9b9ba48ba82..e6772dc65d9 100644
--- a/src/xfns.c
+++ b/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;
 	  }