From b499dc61ef1730844d9964b0832139c23eea2b91 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Wed, 6 Feb 2013 22:50:14 -0600
Subject: [PATCH] * usr/bin/byobu, usr/share/byobu/keybindings/f-keys.tmux: LP:
 #1103449   - fix regression, re-enable blank window titles in both screen and
 tmux

---
 debian/changelog                        |  2 ++
 usr/bin/byobu                           | 37 ++++++++++++++++---------
 usr/share/byobu/keybindings/f-keys.tmux |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0cc10d0..2640328f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ byobu (5.31) unreleased; urgency=low
     - support fish shell in the installer
   * usr/bin/byobu-select-session:
     - fix python exception
+  * usr/bin/byobu, usr/share/byobu/keybindings/f-keys.tmux: LP: #1103449
+    - fix regression, re-enable blank window titles in both screen and tmux
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 28 Jan 2013 02:21:15 -0600
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index eb8c5328..6c69891a 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -140,18 +140,8 @@ case $BYOBU_BACKEND in
 				-*r*|-*d*|-*D*|-*S*|-ls|-list)
 					BYOBU_SESSION_NAME=
 				;;
-				-t)
-					shelltitle=1
-				;;
 			esac
 		done
-		if [ -n "$shelltitle" ]; then
-			unset shelltitle
-			unset BYOBU_SHELL_TITLE
-		else
-			BYOBU_SHELL_TITLE="-t ."
-
-		fi
 		sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true
 	;;
 esac
@@ -164,7 +154,14 @@ esac
 if [ "$#" = "0" ]; then
 	if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
 		# Start new custom window set session
-		exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE
+		case $BYOBU_BACKEND in
+			tmux)
+				exec tmux $SCREEN_TERM $BYOBU_PROFILE
+			;;
+			screen)
+				exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t ''
+			;;
+		esac
 	else
 		case "$sessions" in
 			*\(*\)*)
@@ -173,13 +170,27 @@ if [ "$#" = "0" ]; then
 			;;
 			*)
 				# Start new default session
-				exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE $DEFAULT_WINDOW
+				case $BYOBU_BACKEND in
+					tmux)
+						exec tmux $SCREEN_TERM $BYOBU_PROFILE $DEFAULT_WINDOW
+					;;
+					screen)
+						exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t '' $DEFAULT_WINDOW
+					;;
+				esac
 			;;
 		esac
 	fi
 else
 	# Launch with command line args
-	exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE "$@"
+	case $BYOBU_BACKEND in
+		tmux)
+			exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_PROFILE "$@"
+		;;
+		screen)
+			exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t '' "$@"
+		;;
+	esac
 fi
 
 # vi: syntax=sh ts=4 noexpandtab
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index 35c93f98..fff5f0a0 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -28,7 +28,7 @@ source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux.disable
 # Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt
 bind-key -n F1 new-window -k -n config byobu-config
 bind-key -n S-F1 new-window -k -n help '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'
-bind-key -n F2 new-window \; rename-window "$BYOBU_SHELL_TITLE"
+bind-key -n F2 new-window \; rename-window ""
 bind-key -n C-F2 display-panes \; split-window -h
 bind-key -n S-F2 display-panes \; split-window -v
 bind-key -n C-S-F2 new-session