Index: names.c
===================================================================
--- names.c	(revision 2710)
+++ names.c	(working copy)
@@ -78,13 +78,11 @@
 		wname = name;
 	}
 
-	if (strcmp(wname, w->name) == 0)
-		xfree(wname);
-	else {
-		xfree(w->name);
-		w->name = wname;
+	if (strcmp(wname, w->name)) {
+		window_set_name(w, wname);
 		server_status_window(w);
 	}
+	xfree(wname);
 }
 
 char *