From 143b604e90e8c993cf8d96fdc70d48dacb01a9d1 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sun, 17 Jul 2011 14:08:55 -0500
Subject: [PATCH] * usr/lib/byobu/logo:   - print trailing whitespace *
 usr/lib/byobu/network   - initialize and localize variables *
 usr/share/byobu/profiles/common:   - drop run-this-one (was not working quite
 as desired

---
 debian/changelog                | 6 ++++++
 usr/lib/byobu/logo              | 1 +
 usr/lib/byobu/network           | 1 +
 usr/share/byobu/profiles/common | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 578cc4b3..cd005e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,12 @@ byobu (4.18) unreleased; urgency=low
     usr/share/byobu/profiles/classroom:
     - fixup byobu-classroom
     - fix whitespace printing in byobu-status-print
+  * usr/lib/byobu/logo:
+    - print trailing whitespace
+  * usr/lib/byobu/network
+    - initialize and localize variables
+  * usr/share/byobu/profiles/common:
+    - drop run-this-one (was not working quite as desired
 
   [ James Spencer ]
   * usr/lib/byobu/.constants:
diff --git a/usr/lib/byobu/logo b/usr/lib/byobu/logo
index 355c8930..206a5028 100755
--- a/usr/lib/byobu/logo
+++ b/usr/lib/byobu/logo
@@ -116,6 +116,7 @@ __logo() {
 			$MARKUP && printf "$(color b k W)%s$(color -)" "$logo" || printf " $logo "
 		;;
 	esac
+	printf " "
 }
 
 # vi: syntax=sh ts=4 noexpandtab
diff --git a/usr/lib/byobu/network b/usr/lib/byobu/network
index 44f58374..92681585 100755
--- a/usr/lib/byobu/network
+++ b/usr/lib/byobu/network
@@ -37,6 +37,7 @@ __network_detail() {
 
 __network() {
 	get_interface; local interface="$_RET"
+	local t1=0 t2=0 x1=0 x2=0
 	# By default, we won't bug the user with the display of network traffic
 	# below NETWORK_THRESHOLD in kbps; override in $BYOBU_CONFIG_DIR/status
 	[ -n "$NETWORK_THRESHOLD" ] || NETWORK_THRESHOLD=20
diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common
index 18a0bb67..bd9f7db2 100644
--- a/usr/share/byobu/profiles/common
+++ b/usr/share/byobu/profiles/common
@@ -32,7 +32,7 @@ backtick 10	9999999	9999999	byobu-janitor
 backtick 11	9999999 9999999	printf "\005-1="
 backtick 12	9999999 9999999	byobu-status color
 backtick 13	0       0	byobu-status notify_osd
-backtick 1000	0	0	run-this-one byobu-statusd
+backtick 1000	0	0	byobu-statusd
 backtick 1001	1	1	byobu-status-print 1
 backtick 1002	1	1	byobu-status-print 2
 backtick 1003	1	1	byobu-status-print 3