summaryrefslogtreecommitdiff
path: root/src/add_window.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
commit743f4680b547e4d9f4addb9b6525bc9a7fb33a0c (patch)
treeed924da0c789e5c28a6a517b169d18216362b832 /src/add_window.c
parent22e912f7338ee41bd0f84f4330f4e8bc0c7501d9 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/add_window.c')
-rw-r--r--src/add_window.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/add_window.c b/src/add_window.c
index 85dae57..9b6a6c7 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.12 2002/12/10 22:28:07 tsi Exp $ */
+/* $XFree86: xc/programs/twm/add_window.c,v 1.13 2003/08/04 10:32:30 eich Exp $ */
/*****************************************************************************/
/*
@@ -209,6 +209,13 @@ IconMgr *iconp;
FetchWmProtocols (tmp_win);
FetchWmColormapWindows (tmp_win);
+ if (name == NULL)
+ tmp_win->name = strdup(NoName);
+ else {
+ tmp_win->name = strdup(name);
+ free(name);
+ }
+
if (GetWindowConfig (tmp_win,
&saved_x, &saved_y, &saved_width, &saved_height,
&restore_iconified, &restore_icon_info_present,
@@ -277,12 +284,6 @@ IconMgr *iconp;
tmp_win->transient = Transient(tmp_win->w, &tmp_win->transientfor);
tmp_win->nameChanged = 0;
- if (name == NULL)
- tmp_win->name = strdup(NoName);
- else {
- tmp_win->name = strdup(name);
- free(name);
- }
if (tmp_win->class.res_name == NULL)
tmp_win->class.res_name = NoName;
if (tmp_win->class.res_class == NULL)