From eb440876d41cad96c96801b41bfae1615d24fdc6 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Wed, 5 Jan 2011 15:06:09 -0600
Subject: [PATCH] usr/bin/byobu, usr/bin/byobu-janitor: move the print for
 window title setting into byobu-janitor, which should ensure that it gets run
 on F5/refresh operations

---
 debian/changelog      | 3 +++
 usr/bin/byobu         | 3 ---
 usr/bin/byobu-janitor | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 021f9cb9..4c9e66df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 byobu (3.21) unreleased; urgency=low
 
   * usr/bin/byobu-select-profile: ensure that $DATA exists, LP: #697724
+  * usr/bin/byobu, usr/bin/byobu-janitor: move the print for window
+    title setting into byobu-janitor, which should ensure that it
+    gets run on F5/refresh operations
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 03 Jan 2011 11:44:19 -0600
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index b59be3b8..d8d2a815 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -46,9 +46,6 @@ fi
 # Sanitize the environment
 byobu-janitor --force
 
-# Set window title until https://bugs.launchpad.net/bugs/338722 is fixed in screen
-printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
-
 # Allow override of default window list, with BYOBU_WINDOWS environment variable
 CUSTOM_WINDOW_SET=0
 if [ -r "$BYOBU_WINDOWS" ]; then
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index bc4592f9..32434c7a 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -27,6 +27,9 @@ XDG="$HOME/.local/share/$PKG"
 RUN="$SOCKETDIR/S-$USER"
 FLAG="$RUN/$PKG.reload-required"
 
+# Set the window title
+printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
+
 # Let's get prepped to switch over to XDG one day; maintain symlink for now
 mkdir -p "$XDG"
 if [ -d "$DATA" ] && [ ! -h "$DATA" ]; then